aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTomasz Figa <t.figa@samsung.com>2013-06-14 20:17:33 -0400
committerKukjin Kim <kgene.kim@samsung.com>2013-06-18 12:27:05 -0400
commitd6280ffb44a3f9bf98efeb214fc46c6b551799f5 (patch)
tree82c409da1dba1316d52d9fc6bd2491f2c6aa3a34 /arch
parente245f9699e941fcc01af200806e8307e4ab7198d (diff)
ARM: SAMSUNG: Include most of mach/ headers conditionally
Since it is illegal to include mach/ headers from source files outside of respective mach-* directory and DT-only Samsung platforms might not have all of them anyway, this patches makes inclusion of them conditional, based on CONFIG_SAMSUNG_ATAGS. Signed-off-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-samsung/pm.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/pm.c b/arch/arm/plat-samsung/pm.c
index 53210ec4e8ec..d76ab723e1b7 100644
--- a/arch/arm/plat-samsung/pm.c
+++ b/arch/arm/plat-samsung/pm.c
@@ -21,13 +21,17 @@
21 21
22#include <asm/cacheflush.h> 22#include <asm/cacheflush.h>
23#include <asm/suspend.h> 23#include <asm/suspend.h>
24#include <mach/hardware.h>
25#include <mach/map.h>
26 24
27#include <plat/regs-serial.h> 25#include <plat/regs-serial.h>
26
27#ifdef CONFIG_SAMSUNG_ATAGS
28#include <mach/hardware.h>
29#include <mach/map.h>
28#include <mach/regs-clock.h> 30#include <mach/regs-clock.h>
29#include <mach/regs-irq.h> 31#include <mach/regs-irq.h>
30#include <mach/irqs.h> 32#include <mach/irqs.h>
33#endif
34
31#include <asm/irq.h> 35#include <asm/irq.h>
32 36
33#include <plat/pm.h> 37#include <plat/pm.h>