summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/leds-mainstone.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-20 12:39:18 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-20 12:39:18 +0200
commit170465ee7f5a9a2d0ac71285507e52642e040353 (patch)
treedbca81f04cde9e625170abbd6a72555cfbeb194e /arch/arm/mach-pxa/leds-mainstone.c
parentxen_alloc_ptpage: cast PFN_PHYS() argument to unsigned long (diff)
parentMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff)
downloadlinux-170465ee7f5a9a2d0ac71285507e52642e040353.tar.xz
linux-170465ee7f5a9a2d0ac71285507e52642e040353.zip
Merge branch 'linus' into x86/xen
Diffstat (limited to 'arch/arm/mach-pxa/leds-mainstone.c')
-rw-r--r--arch/arm/mach-pxa/leds-mainstone.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/leds-mainstone.c b/arch/arm/mach-pxa/leds-mainstone.c
index 065293eb0d82..95e06b849634 100644
--- a/arch/arm/mach-pxa/leds-mainstone.c
+++ b/arch/arm/mach-pxa/leds-mainstone.c
@@ -12,12 +12,12 @@
#include <linux/init.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
#include <asm/leds.h>
#include <asm/system.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/mainstone.h>
+#include <mach/pxa-regs.h>
+#include <mach/mainstone.h>
#include "leds.h"