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 'for-linus' of git://neil.brown.name/md
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
colibri-pxa320.c
diff --git
a/arch/arm/mach-pxa/colibri-pxa320.c
b/arch/arm/mach-pxa/colibri-pxa320.c
index
d2c6631
..
d23b92b
100644
(file)
--- a/
arch/arm/mach-pxa/colibri-pxa320.c
+++ b/
arch/arm/mach-pxa/colibri-pxa320.c
@@
-146,7
+146,7
@@
static void __init colibri_pxa320_init_eth(void)
static inline void __init colibri_pxa320_init_eth(void) {}
#endif /* CONFIG_AX88796 */
static inline void __init colibri_pxa320_init_eth(void) {}
#endif /* CONFIG_AX88796 */
-#if defined(CONFIG_USB_
GADGET_PXA27X)||defined(CONFIG_USB_GADGET
_PXA27X_MODULE)
+#if defined(CONFIG_USB_
PXA27X)||defined(CONFIG_USB
_PXA27X_MODULE)
static struct gpio_vbus_mach_info colibri_pxa320_gpio_vbus_info = {
.gpio_vbus = mfp_to_gpio(MFP_PIN_GPIO96),
.gpio_pullup = -1,
static struct gpio_vbus_mach_info colibri_pxa320_gpio_vbus_info = {
.gpio_vbus = mfp_to_gpio(MFP_PIN_GPIO96),
.gpio_pullup = -1,
@@
-253,7
+253,7
@@
void __init colibri_pxa320_init(void)
}
MACHINE_START(COLIBRI320, "Toradex Colibri PXA320")
}
MACHINE_START(COLIBRI320, "Toradex Colibri PXA320")
- .
boot_params = COLIBRI_SDRAM_BASE +
0x100,
+ .
atag_offset =
0x100,
.init_machine = colibri_pxa320_init,
.map_io = pxa3xx_map_io,
.init_irq = pxa3xx_init_irq,
.init_machine = colibri_pxa320_init,
.map_io = pxa3xx_map_io,
.init_irq = pxa3xx_init_irq,