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-spi' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
hx4700.c
diff --git
a/arch/arm/mach-pxa/hx4700.c
b/arch/arm/mach-pxa/hx4700.c
index
76d93a2
..
a908e0a
100644
(file)
--- a/
arch/arm/mach-pxa/hx4700.c
+++ b/
arch/arm/mach-pxa/hx4700.c
@@
-33,6
+33,7
@@
#include <linux/regulator/max1586.h>
#include <linux/spi/ads7846.h>
#include <linux/spi/spi.h>
#include <linux/regulator/max1586.h>
#include <linux/spi/ads7846.h>
#include <linux/spi/spi.h>
+#include <linux/spi/pxa2xx_spi.h>
#include <linux/usb/gpio_vbus.h>
#include <mach/hardware.h>
#include <linux/usb/gpio_vbus.h>
#include <mach/hardware.h>
@@
-43,7
+44,6
@@
#include <mach/hx4700.h>
#include <plat/i2c.h>
#include <mach/irda.h>
#include <mach/hx4700.h>
#include <plat/i2c.h>
#include <mach/irda.h>
-#include <mach/pxa2xx_spi.h>
#include <video/platform_lcd.h>
#include <video/w100fb.h>
#include <video/platform_lcd.h>
#include <video/w100fb.h>
@@
-871,7
+871,7
@@
static void __init hx4700_init(void)
MACHINE_START(H4700, "HP iPAQ HX4700")
.boot_params = 0xa0000100,
MACHINE_START(H4700, "HP iPAQ HX4700")
.boot_params = 0xa0000100,
- .map_io = pxa_map_io,
+ .map_io = pxa
27x
_map_io,
.nr_irqs = HX4700_NR_IRQS,
.init_irq = pxa27x_init_irq,
.init_machine = hx4700_init,
.nr_irqs = HX4700_NR_IRQS,
.init_irq = pxa27x_init_irq,
.init_machine = hx4700_init,