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 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-2430sdp.c
diff --git
a/arch/arm/mach-omap2/board-2430sdp.c
b/arch/arm/mach-omap2/board-2430sdp.c
index
b527f8d
..
e066177
100644
(file)
--- a/
arch/arm/mach-omap2/board-2430sdp.c
+++ b/
arch/arm/mach-omap2/board-2430sdp.c
@@
-135,7
+135,7
@@
static inline void board_smc91x_init(void)
#endif
#endif
-static struct omap_board_config_kernel sdp2430_config[] = {
+static struct omap_board_config_kernel sdp2430_config[]
__initdata
= {
{OMAP_TAG_LCD, &sdp2430_lcd_config},
};
{OMAP_TAG_LCD, &sdp2430_lcd_config},
};
@@
-143,9
+143,9
@@
static void __init omap_2430sdp_init_irq(void)
{
omap_board_config = sdp2430_config;
omap_board_config_size = ARRAY_SIZE(sdp2430_config);
{
omap_board_config = sdp2430_config;
omap_board_config_size = ARRAY_SIZE(sdp2430_config);
- omap2_init_common_hw(NULL, NULL);
+ omap2_init_common_infrastructure();
+ omap2_init_common_devices(NULL, NULL);
omap_init_irq();
omap_init_irq();
- omap_gpio_init();
}
static struct twl4030_gpio_platform_data sdp2430_gpio_data = {
}
static struct twl4030_gpio_platform_data sdp2430_gpio_data = {
@@
-218,8
+218,6
@@
static struct omap_usb_config sdp2430_usb_config __initdata = {
static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR },
};
static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR },
};
-#else
-#define board_mux NULL
#endif
static void __init omap_2430sdp_init(void)
#endif
static void __init omap_2430sdp_init(void)