diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
| commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
| tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /arch/arm/mach-cns3xxx/include/mach/pm.h | |
| parent | 8e267f3da5f117d2f1316cf6ddf740f93f1c73aa (diff) | |
| parent | 580975d7f48d7d047e22bb0f42adf7557801d8d4 (diff) | |
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'arch/arm/mach-cns3xxx/include/mach/pm.h')
| -rw-r--r-- | arch/arm/mach-cns3xxx/include/mach/pm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-cns3xxx/include/mach/pm.h b/arch/arm/mach-cns3xxx/include/mach/pm.h index 6eae7f764d1d..c2588cc991d1 100644 --- a/arch/arm/mach-cns3xxx/include/mach/pm.h +++ b/arch/arm/mach-cns3xxx/include/mach/pm.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #ifndef __CNS3XXX_PM_H | 11 | #ifndef __CNS3XXX_PM_H |
| 12 | #define __CNS3XXX_PM_H | 12 | #define __CNS3XXX_PM_H |
| 13 | 13 | ||
| 14 | #include <asm/atomic.h> | 14 | #include <linux/atomic.h> |
| 15 | 15 | ||
| 16 | void cns3xxx_pwr_clk_en(unsigned int block); | 16 | void cns3xxx_pwr_clk_en(unsigned int block); |
| 17 | void cns3xxx_pwr_clk_dis(unsigned int block); | 17 | void cns3xxx_pwr_clk_dis(unsigned int block); |