git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
mach-mmp
/
gplugd.c
diff --git
a/arch/arm/mach-mmp/gplugd.c
b/arch/arm/mach-mmp/gplugd.c
index
98e25d9
..
6915656
100644
(file)
--- a/
arch/arm/mach-mmp/gplugd.c
+++ b/
arch/arm/mach-mmp/gplugd.c
@@
-9,11
+9,11
@@
*/
#include <linux/init.h>
*/
#include <linux/init.h>
+#include <linux/gpio.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
-#include <mach/gpio.h>
#include <mach/pxa168.h>
#include <mach/mfp-pxa168.h>
#include <mach/pxa168.h>
#include <mach/mfp-pxa168.h>
@@
-188,7
+188,7
@@
static void __init gplugd_init(void)
pxa168_add_eth(&gplugd_eth_platform_data);
}
pxa168_add_eth(&gplugd_eth_platform_data);
}
-MACHINE_START(
SHEEVA
D, "PXA168-based GuruPlug Display (gplugD) Platform")
+MACHINE_START(
GPLUG
D, "PXA168-based GuruPlug Display (gplugD) Platform")
.map_io = mmp_map_io,
.nr_irqs = IRQ_BOARD_START,
.init_irq = pxa168_init_irq,
.map_io = mmp_map_io,
.nr_irqs = IRQ_BOARD_START,
.init_irq = pxa168_init_irq,