diff options
Diffstat (limited to 'arch/arm/mach-cns3xxx/include')
-rw-r--r-- | arch/arm/mach-cns3xxx/include/mach/pm.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-cns3xxx/include/mach/vmalloc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-cns3xxx/include/mach/pm.h b/arch/arm/mach-cns3xxx/include/mach/pm.h index 6eae7f764d1..c2588cc991d 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); |
diff --git a/arch/arm/mach-cns3xxx/include/mach/vmalloc.h b/arch/arm/mach-cns3xxx/include/mach/vmalloc.h index 4d381ec0527..1dd231d2f77 100644 --- a/arch/arm/mach-cns3xxx/include/mach/vmalloc.h +++ b/arch/arm/mach-cns3xxx/include/mach/vmalloc.h | |||
@@ -8,4 +8,4 @@ | |||
8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #define VMALLOC_END 0xd8000000 | 11 | #define VMALLOC_END 0xd8000000UL |