diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-12 12:57:32 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-12 12:57:32 +0900 |
| commit | 9f06cf38eca57e279b4c78e465e19f10c2f78174 (patch) | |
| tree | c33b3b3e5dc32a1211bd8c99a4eed3752c05108b /arch/sh/include | |
| parent | a4d5247310c993b6b30f1686be12ddacfc41142a (diff) | |
| parent | d3442b2bb7ce4089fadcf483b8ae9766ab480238 (diff) | |
| download | blackbird-op-linux-9f06cf38eca57e279b4c78e465e19f10c2f78174.tar.gz blackbird-op-linux-9f06cf38eca57e279b4c78e465e19f10c2f78174.zip | |
Merge branch 'sh/pm-runtime' into sh-latest
Conflicts:
arch/sh/kernel/cpu/sh4a/clock-sh7723.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/device.h | 9 | ||||
| -rw-r--r-- | arch/sh/include/asm/hwblk.h | 7 |
2 files changed, 6 insertions, 10 deletions
diff --git a/arch/sh/include/asm/device.h b/arch/sh/include/asm/device.h index b16debfe8c1e..783ecdc64e25 100644 --- a/arch/sh/include/asm/device.h +++ b/arch/sh/include/asm/device.h @@ -14,15 +14,6 @@ int platform_resource_setup_memory(struct platform_device *pdev, void plat_early_device_setup(void); -#define PDEV_ARCHDATA_FLAG_INIT 0 -#define PDEV_ARCHDATA_FLAG_IDLE 1 -#define PDEV_ARCHDATA_FLAG_SUSP 2 - struct pdev_archdata { int hwblk_id; -#ifdef CONFIG_PM_RUNTIME - unsigned long flags; - struct list_head entry; - struct mutex mutex; -#endif }; diff --git a/arch/sh/include/asm/hwblk.h b/arch/sh/include/asm/hwblk.h index 855e945c6199..e29461bbe84d 100644 --- a/arch/sh/include/asm/hwblk.h +++ b/arch/sh/include/asm/hwblk.h @@ -44,6 +44,9 @@ struct hwblk_info { int nr_hwblks; }; +#if !defined(CONFIG_CPU_SUBTYPE_SH7722) && \ + !defined(CONFIG_CPU_SUBTYPE_SH7723) && \ + !defined(CONFIG_CPU_SUBTYPE_SH7724) /* Should be defined by processor-specific code */ int arch_hwblk_init(void); int arch_hwblk_sleep_mode(void); @@ -66,5 +69,7 @@ void hwblk_cnt_dec(struct hwblk_info *info, int hwblk, int cnt); } int sh_hwblk_clk_register(struct clk *clks, int nr); - +#else +#define hwblk_init() 0 +#endif #endif /* __ASM_SH_HWBLK_H */ |
