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-3430sdp.c
diff --git
a/arch/arm/mach-omap2/board-3430sdp.c
b/arch/arm/mach-omap2/board-3430sdp.c
index 4e3742c512b81f3da619c7cb9895bad8fe61b39e..869fb133c207f690d759035c4c1e7215256d5d71 100644
(file)
--- a/
arch/arm/mach-omap2/board-3430sdp.c
+++ b/
arch/arm/mach-omap2/board-3430sdp.c
@@
-328,7
+328,6
@@
static void __init omap_3430sdp_init_irq(void)
omap3_pm_init_cpuidle(omap3_cpuidle_params_table);
omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL);
omap_init_irq();
omap3_pm_init_cpuidle(omap3_cpuidle_params_table);
omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL);
omap_init_irq();
- omap_gpio_init();
}
static int sdp3430_batt_table[] = {
}
static int sdp3430_batt_table[] = {
@@
-663,8
+662,6
@@
static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
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
/*
#endif
/*