projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel-gpio' into omap-for-linus
[firefly-linux-kernel-4.4.55.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 b527f8d187ad571f3d3ee7e04514393f1891f2b7..c00f26aca0d6105678138501dfbb298fdda4a5e5 100644
(file)
--- a/
arch/arm/mach-omap2/board-2430sdp.c
+++ b/
arch/arm/mach-omap2/board-2430sdp.c
@@
-145,7
+145,6
@@
static void __init omap_2430sdp_init_irq(void)
omap_board_config_size = ARRAY_SIZE(sdp2430_config);
omap2_init_common_hw(NULL, NULL);
omap_init_irq();
omap_board_config_size = ARRAY_SIZE(sdp2430_config);
omap2_init_common_hw(NULL, NULL);
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
+217,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)