diff options
author | Manjunath Kondaiah G <manjugk@ti.com> | 2010-10-08 12:58:35 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-10-08 13:02:49 -0400 |
commit | 04aeae777945df0e3e37d968d211c821c7458cc5 (patch) | |
tree | 8bdc06f589442bb3927cdf0199cc91bea70bd1d6 | |
parent | 38815733972655ee3cbfc34e254c403c332693c3 (diff) |
OMAP2plus: Fix static function warnings
This patch fixes sparse warnings due non declarations of static functions.
arch/arm/mach-omap2/timer-gp.c:115:12: warning: symbol 'omap2_gp_clockevent_set_gptimer' was not declared. Should it be static?
arch/arm/mach-omap2/powerdomain.c:993:5: warning: symbol 'pwrdm_set_lowpwrstchange' was not declared. Should it be static?
arch/arm/mach-omap2/board-flash.c:141:8: warning: symbol 'board_nand_init' was not declared. Should it be static?
arch/arm/mach-omap2/board-n8x0.c:416:6: warning: symbol 'n8x0_mmc_slot1_cover_handler' was not declared. Should it be static?
arch/arm/mach-omap2/board-n8x0.c:544:13: warning: symbol 'n8x0_mmc_init' was not declared. Should it be static?
arch/arm/mach-omap2/board-rx51-peripherals.c:902:13: warning: symbol 'rx51_peripherals_init' was not declared. Should it be static?
arch/arm/mach-omap2/board-rx51-video.c:107:13: warning: symbol 'rx51_video_mem_init' was not declared. Should it be static?
arch/arm/mach-omap2/board-zoom-debugboard.c:155:12: warning: symbol 'zoom_debugboard_init' was not declared. Should it be static?
arch/arm/mach-omap2/board-zoom-peripherals.c:280:13: warning: symbol 'zoom_peripherals_init' was not declared. Should it be static?
arch/arm/mach-omap2/board-igep0020.c:110:13: warning: symbol 'igep2_flash_init' was not declared. Should it be static?
arch/arm/mach-omap2/board-am3517evm.c:109:6: warning: symbol 'am3517_evm_ethernet_init' was not declared. Should it be static?
drivers/mtd/onenand/omap2.c:577:5: warning: symbol 'omap2_onenand_rephase' was not declared. Should it be static?
Signed-off-by: Manjunath Kondaiah G <manjugk@ti.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
26 files changed, 44 insertions, 35 deletions
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index 3eb9839e33ed..9a6552271445 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c | |||
@@ -42,8 +42,7 @@ | |||
42 | #include <plat/control.h> | 42 | #include <plat/control.h> |
43 | #include <plat/gpmc-smc91x.h> | 43 | #include <plat/gpmc-smc91x.h> |
44 | 44 | ||
45 | #include <mach/board-flash.h> | 45 | #include "board-flash.h" |
46 | |||
47 | #include "mux.h" | 46 | #include "mux.h" |
48 | #include "sdram-qimonda-hyb18m512160af-6.h" | 47 | #include "sdram-qimonda-hyb18m512160af-6.h" |
49 | #include "hsmmc.h" | 48 | #include "hsmmc.h" |
diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c index b359c3f7bb39..2b2e0efd5570 100644 --- a/arch/arm/mach-omap2/board-3630sdp.c +++ b/arch/arm/mach-omap2/board-3630sdp.c | |||
@@ -21,8 +21,8 @@ | |||
21 | #include <plat/usb.h> | 21 | #include <plat/usb.h> |
22 | 22 | ||
23 | #include <mach/board-zoom.h> | 23 | #include <mach/board-zoom.h> |
24 | #include <mach/board-flash.h> | ||
25 | 24 | ||
25 | #include "board-flash.h" | ||
26 | #include "mux.h" | 26 | #include "mux.h" |
27 | #include "sdram-hynix-h8mbx00u0mer-0em.h" | 27 | #include "sdram-hynix-h8mbx00u0mer-0em.h" |
28 | 28 | ||
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 1bed1e666a60..d70b58002d2b 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c | |||
@@ -33,10 +33,11 @@ | |||
33 | #include <plat/board.h> | 33 | #include <plat/board.h> |
34 | #include <plat/common.h> | 34 | #include <plat/common.h> |
35 | #include <plat/control.h> | 35 | #include <plat/control.h> |
36 | #include <plat/timer-gp.h> | ||
37 | #include <plat/usb.h> | 36 | #include <plat/usb.h> |
38 | #include <plat/mmc.h> | 37 | #include <plat/mmc.h> |
38 | |||
39 | #include "hsmmc.h" | 39 | #include "hsmmc.h" |
40 | #include "timer-gp.h" | ||
40 | 41 | ||
41 | #define ETH_KS8851_IRQ 34 | 42 | #define ETH_KS8851_IRQ 34 |
42 | #define ETH_KS8851_POWER_ON 48 | 43 | #define ETH_KS8851_POWER_ON 48 |
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index 197289b474e4..ae22ea8f69c7 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c | |||
@@ -106,7 +106,7 @@ static void am3517_disable_ethernet_int(void) | |||
106 | regval = omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR); | 106 | regval = omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR); |
107 | } | 107 | } |
108 | 108 | ||
109 | void am3517_evm_ethernet_init(struct emac_platform_data *pdata) | 109 | static void am3517_evm_ethernet_init(struct emac_platform_data *pdata) |
110 | { | 110 | { |
111 | unsigned int regval; | 111 | unsigned int regval; |
112 | 112 | ||
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index de5e2c2f4e80..1aff79e43d8e 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c | |||
@@ -45,7 +45,6 @@ | |||
45 | #include <plat/gpmc.h> | 45 | #include <plat/gpmc.h> |
46 | #include <plat/nand.h> | 46 | #include <plat/nand.h> |
47 | #include <plat/usb.h> | 47 | #include <plat/usb.h> |
48 | #include <plat/timer-gp.h> | ||
49 | #include <plat/display.h> | 48 | #include <plat/display.h> |
50 | 49 | ||
51 | #include <plat/mcspi.h> | 50 | #include <plat/mcspi.h> |
@@ -59,6 +58,7 @@ | |||
59 | 58 | ||
60 | #include "mux.h" | 59 | #include "mux.h" |
61 | #include "hsmmc.h" | 60 | #include "hsmmc.h" |
61 | #include "timer-gp.h" | ||
62 | 62 | ||
63 | #define NAND_BLOCK_SIZE SZ_128K | 63 | #define NAND_BLOCK_SIZE SZ_128K |
64 | 64 | ||
diff --git a/arch/arm/mach-omap2/board-flash.c b/arch/arm/mach-omap2/board-flash.c index ac834aa7abf6..fd38c05bb47f 100644 --- a/arch/arm/mach-omap2/board-flash.c +++ b/arch/arm/mach-omap2/board-flash.c | |||
@@ -21,7 +21,8 @@ | |||
21 | #include <plat/nand.h> | 21 | #include <plat/nand.h> |
22 | #include <plat/onenand.h> | 22 | #include <plat/onenand.h> |
23 | #include <plat/tc.h> | 23 | #include <plat/tc.h> |
24 | #include <mach/board-flash.h> | 24 | |
25 | #include "board-flash.h" | ||
25 | 26 | ||
26 | #define REG_FPGA_REV 0x10 | 27 | #define REG_FPGA_REV 0x10 |
27 | #define REG_FPGA_DIP_SWITCH_INPUT2 0x60 | 28 | #define REG_FPGA_DIP_SWITCH_INPUT2 0x60 |
diff --git a/arch/arm/mach-omap2/include/mach/board-flash.h b/arch/arm/mach-omap2/board-flash.h index b2242ae2bb6f..69befe00dd2f 100644 --- a/arch/arm/mach-omap2/include/mach/board-flash.h +++ b/arch/arm/mach-omap2/board-flash.h | |||
@@ -26,3 +26,5 @@ struct flash_partitions { | |||
26 | 26 | ||
27 | extern void board_flash_init(struct flash_partitions [], | 27 | extern void board_flash_init(struct flash_partitions [], |
28 | char chip_sel[][GPMC_CS_NUM]); | 28 | char chip_sel[][GPMC_CS_NUM]); |
29 | extern void board_nand_init(struct mtd_partition *nand_parts, | ||
30 | u8 nr_parts, u8 cs); | ||
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c index f3f028056916..c437031554b0 100644 --- a/arch/arm/mach-omap2/board-igep0020.c +++ b/arch/arm/mach-omap2/board-igep0020.c | |||
@@ -108,7 +108,7 @@ static struct platform_device igep2_onenand_device = { | |||
108 | }, | 108 | }, |
109 | }; | 109 | }; |
110 | 110 | ||
111 | void __init igep2_flash_init(void) | 111 | static void __init igep2_flash_init(void) |
112 | { | 112 | { |
113 | u8 cs = 0; | 113 | u8 cs = 0; |
114 | u8 onenandcs = GPMC_CS_NUM + 1; | 114 | u8 onenandcs = GPMC_CS_NUM + 1; |
@@ -142,7 +142,7 @@ void __init igep2_flash_init(void) | |||
142 | } | 142 | } |
143 | 143 | ||
144 | #else | 144 | #else |
145 | void __init igep2_flash_init(void) {} | 145 | static void __init igep2_flash_init(void) {} |
146 | #endif | 146 | #endif |
147 | 147 | ||
148 | #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) | 148 | #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) |
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index 58698e359ccf..38c445188839 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c | |||
@@ -45,6 +45,7 @@ | |||
45 | #include <plat/control.h> | 45 | #include <plat/control.h> |
46 | #include <plat/usb.h> | 46 | #include <plat/usb.h> |
47 | 47 | ||
48 | #include "board-flash.h" | ||
48 | #include "mux.h" | 49 | #include "mux.h" |
49 | #include "hsmmc.h" | 50 | #include "hsmmc.h" |
50 | 51 | ||
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c index 8fd226989b25..abdcc3963a17 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c | |||
@@ -384,15 +384,6 @@ static void n8x0_mmc_callback(void *data, u8 card_mask) | |||
384 | omap_mmc_notify_cover_event(mmc_device, index, *openp); | 384 | omap_mmc_notify_cover_event(mmc_device, index, *openp); |
385 | } | 385 | } |
386 | 386 | ||
387 | void n8x0_mmc_slot1_cover_handler(void *arg, int closed_state) | ||
388 | { | ||
389 | if (mmc_device == NULL) | ||
390 | return; | ||
391 | |||
392 | slot1_cover_open = !closed_state; | ||
393 | omap_mmc_notify_cover_event(mmc_device, 0, closed_state); | ||
394 | } | ||
395 | |||
396 | static int n8x0_mmc_late_init(struct device *dev) | 387 | static int n8x0_mmc_late_init(struct device *dev) |
397 | { | 388 | { |
398 | int r, bit, *openp; | 389 | int r, bit, *openp; |
@@ -512,7 +503,7 @@ static struct omap_mmc_platform_data mmc1_data = { | |||
512 | 503 | ||
513 | static struct omap_mmc_platform_data *mmc_data[OMAP24XX_NR_MMC]; | 504 | static struct omap_mmc_platform_data *mmc_data[OMAP24XX_NR_MMC]; |
514 | 505 | ||
515 | void __init n8x0_mmc_init(void) | 506 | static void __init n8x0_mmc_init(void) |
516 | 507 | ||
517 | { | 508 | { |
518 | int err; | 509 | int err; |
@@ -561,11 +552,6 @@ void __init n8x0_mmc_init(void) | |||
561 | void __init n8x0_mmc_init(void) | 552 | void __init n8x0_mmc_init(void) |
562 | { | 553 | { |
563 | } | 554 | } |
564 | |||
565 | void n8x0_mmc_slot1_cover_handler(void *arg, int state) | ||
566 | { | ||
567 | } | ||
568 | |||
569 | #endif /* CONFIG_MMC_OMAP */ | 555 | #endif /* CONFIG_MMC_OMAP */ |
570 | 556 | ||
571 | #ifdef CONFIG_MENELAUS | 557 | #ifdef CONFIG_MENELAUS |
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 7e7048878649..73689c082b26 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
@@ -44,10 +44,10 @@ | |||
44 | #include <plat/gpmc.h> | 44 | #include <plat/gpmc.h> |
45 | #include <plat/nand.h> | 45 | #include <plat/nand.h> |
46 | #include <plat/usb.h> | 46 | #include <plat/usb.h> |
47 | #include <plat/timer-gp.h> | ||
48 | 47 | ||
49 | #include "mux.h" | 48 | #include "mux.h" |
50 | #include "hsmmc.h" | 49 | #include "hsmmc.h" |
50 | #include "timer-gp.h" | ||
51 | 51 | ||
52 | #define NAND_BLOCK_SIZE SZ_128K | 52 | #define NAND_BLOCK_SIZE SZ_128K |
53 | 53 | ||
diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c index 4c045cf91bc8..3151cf269a59 100644 --- a/arch/arm/mach-omap2/board-omap3logic.c +++ b/arch/arm/mach-omap2/board-omap3logic.c | |||
@@ -35,13 +35,13 @@ | |||
35 | 35 | ||
36 | #include "mux.h" | 36 | #include "mux.h" |
37 | #include "hsmmc.h" | 37 | #include "hsmmc.h" |
38 | #include "timer-gp.h" | ||
38 | 39 | ||
39 | #include <plat/mux.h> | 40 | #include <plat/mux.h> |
40 | #include <plat/board.h> | 41 | #include <plat/board.h> |
41 | #include <plat/common.h> | 42 | #include <plat/common.h> |
42 | #include <plat/gpmc-smsc911x.h> | 43 | #include <plat/gpmc-smsc911x.h> |
43 | #include <plat/gpmc.h> | 44 | #include <plat/gpmc.h> |
44 | #include <plat/timer-gp.h> | ||
45 | #include <plat/sdrc.h> | 45 | #include <plat/sdrc.h> |
46 | #include <plat/control.h> | 46 | #include <plat/control.h> |
47 | 47 | ||
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index 55d24b6cd6e8..c5bd764f1a07 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c | |||
@@ -39,7 +39,6 @@ | |||
39 | #include <plat/gpmc.h> | 39 | #include <plat/gpmc.h> |
40 | #include <plat/nand.h> | 40 | #include <plat/nand.h> |
41 | #include <plat/usb.h> | 41 | #include <plat/usb.h> |
42 | #include <plat/timer-gp.h> | ||
43 | #include <plat/display.h> | 42 | #include <plat/display.h> |
44 | 43 | ||
45 | #include <plat/mcspi.h> | 44 | #include <plat/mcspi.h> |
@@ -53,6 +52,7 @@ | |||
53 | #include "sdram-micron-mt46h32m32lf-6.h" | 52 | #include "sdram-micron-mt46h32m32lf-6.h" |
54 | #include "mux.h" | 53 | #include "mux.h" |
55 | #include "hsmmc.h" | 54 | #include "hsmmc.h" |
55 | #include "timer-gp.h" | ||
56 | 56 | ||
57 | #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) | 57 | #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) |
58 | #define OMAP3STALKER_ETHR_START 0x2c000000 | 58 | #define OMAP3STALKER_ETHR_START 0x2c000000 |
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index 09197a599f74..7d569380d649 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c | |||
@@ -48,10 +48,10 @@ | |||
48 | #include <plat/gpmc.h> | 48 | #include <plat/gpmc.h> |
49 | #include <plat/nand.h> | 49 | #include <plat/nand.h> |
50 | #include <plat/usb.h> | 50 | #include <plat/usb.h> |
51 | #include <plat/timer-gp.h> | ||
52 | 51 | ||
53 | #include "mux.h" | 52 | #include "mux.h" |
54 | #include "hsmmc.h" | 53 | #include "hsmmc.h" |
54 | #include "timer-gp.h" | ||
55 | 55 | ||
56 | #include <asm/setup.h> | 56 | #include <asm/setup.h> |
57 | 57 | ||
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index aa8296e7e9d4..83bd1fe5e323 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c | |||
@@ -35,10 +35,10 @@ | |||
35 | #include <plat/board.h> | 35 | #include <plat/board.h> |
36 | #include <plat/common.h> | 36 | #include <plat/common.h> |
37 | #include <plat/control.h> | 37 | #include <plat/control.h> |
38 | #include <plat/timer-gp.h> | ||
39 | #include <plat/usb.h> | 38 | #include <plat/usb.h> |
40 | #include <plat/mmc.h> | 39 | #include <plat/mmc.h> |
41 | #include "hsmmc.h" | 40 | #include "hsmmc.h" |
41 | #include "timer-gp.h" | ||
42 | 42 | ||
43 | 43 | ||
44 | static struct gpio_led gpio_leds[] = { | 44 | static struct gpio_led gpio_leds[] = { |
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index a3dbaa7b8632..cf6f12ed1d87 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c | |||
@@ -32,6 +32,8 @@ | |||
32 | #include <plat/onenand.h> | 32 | #include <plat/onenand.h> |
33 | #include <plat/gpmc-smc91x.h> | 33 | #include <plat/gpmc-smc91x.h> |
34 | 34 | ||
35 | #include <mach/board-rx51.h> | ||
36 | |||
35 | #include <sound/tlv320aic3x.h> | 37 | #include <sound/tlv320aic3x.h> |
36 | #include <sound/tpa6130a2-plat.h> | 38 | #include <sound/tpa6130a2-plat.h> |
37 | 39 | ||
diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c index 5a1005ba9815..85503fed4e13 100644 --- a/arch/arm/mach-omap2/board-rx51-video.c +++ b/arch/arm/mach-omap2/board-rx51-video.c | |||
@@ -20,6 +20,8 @@ | |||
20 | #include <plat/vram.h> | 20 | #include <plat/vram.h> |
21 | #include <plat/mcspi.h> | 21 | #include <plat/mcspi.h> |
22 | 22 | ||
23 | #include <mach/board-rx51.h> | ||
24 | |||
23 | #include "mux.h" | 25 | #include "mux.h" |
24 | 26 | ||
25 | #define RX51_LCD_RESET_GPIO 90 | 27 | #define RX51_LCD_RESET_GPIO 90 |
diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c index 1d7f827b0408..007ebdc6c993 100644 --- a/arch/arm/mach-omap2/board-zoom-debugboard.c +++ b/arch/arm/mach-omap2/board-zoom-debugboard.c | |||
@@ -16,6 +16,8 @@ | |||
16 | 16 | ||
17 | #include <plat/gpmc.h> | 17 | #include <plat/gpmc.h> |
18 | 18 | ||
19 | #include <mach/board-zoom.h> | ||
20 | |||
19 | #define ZOOM_SMSC911X_CS 7 | 21 | #define ZOOM_SMSC911X_CS 7 |
20 | #define ZOOM_SMSC911X_GPIO 158 | 22 | #define ZOOM_SMSC911X_GPIO 158 |
21 | #define ZOOM_QUADUART_CS 3 | 23 | #define ZOOM_QUADUART_CS 3 |
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index e5eac46bbac9..b8dee5e90175 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c | |||
@@ -25,6 +25,8 @@ | |||
25 | #include <plat/common.h> | 25 | #include <plat/common.h> |
26 | #include <plat/usb.h> | 26 | #include <plat/usb.h> |
27 | 27 | ||
28 | #include <mach/board-zoom.h> | ||
29 | |||
28 | #include "mux.h" | 30 | #include "mux.h" |
29 | #include "hsmmc.h" | 31 | #include "hsmmc.h" |
30 | 32 | ||
diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c index 3ad9ecf7f5e2..d356ef5336c0 100644 --- a/arch/arm/mach-omap2/board-zoom2.c +++ b/arch/arm/mach-omap2/board-zoom2.c | |||
@@ -23,6 +23,7 @@ | |||
23 | 23 | ||
24 | #include <mach/board-zoom.h> | 24 | #include <mach/board-zoom.h> |
25 | 25 | ||
26 | #include "board-flash.h" | ||
26 | #include "mux.h" | 27 | #include "mux.h" |
27 | #include "sdram-micron-mt46h32m32lf-6.h" | 28 | #include "sdram-micron-mt46h32m32lf-6.h" |
28 | 29 | ||
diff --git a/arch/arm/mach-omap2/board-zoom3.c b/arch/arm/mach-omap2/board-zoom3.c index 6ca0b8341615..95895d5bfd17 100644 --- a/arch/arm/mach-omap2/board-zoom3.c +++ b/arch/arm/mach-omap2/board-zoom3.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <plat/board.h> | 22 | #include <plat/board.h> |
23 | #include <plat/usb.h> | 23 | #include <plat/usb.h> |
24 | 24 | ||
25 | #include "board-flash.h" | ||
25 | #include "mux.h" | 26 | #include "mux.h" |
26 | #include "sdram-hynix-h8mbx00u0mer-0em.h" | 27 | #include "sdram-hynix-h8mbx00u0mer-0em.h" |
27 | 28 | ||
diff --git a/arch/arm/mach-omap2/include/mach/board-rx51.h b/arch/arm/mach-omap2/include/mach/board-rx51.h new file mode 100644 index 000000000000..b76f49e7eed5 --- /dev/null +++ b/arch/arm/mach-omap2/include/mach/board-rx51.h | |||
@@ -0,0 +1,11 @@ | |||
1 | /* | ||
2 | * Defines for rx51 boards | ||
3 | */ | ||
4 | |||
5 | #ifndef _OMAP_BOARD_RX51_H | ||
6 | #define _OMAP_BOARD_RX51_H | ||
7 | |||
8 | extern void __init rx51_peripherals_init(void); | ||
9 | extern void __init rx51_video_mem_init(void); | ||
10 | |||
11 | #endif | ||
diff --git a/arch/arm/mach-omap2/include/mach/board-zoom.h b/arch/arm/mach-omap2/include/mach/board-zoom.h index 3af69d2c3dcd..3986f2476b1c 100644 --- a/arch/arm/mach-omap2/include/mach/board-zoom.h +++ b/arch/arm/mach-omap2/include/mach/board-zoom.h | |||
@@ -1,11 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Defines for zoom boards | 2 | * Defines for zoom boards |
3 | */ | 3 | */ |
4 | #include <linux/mtd/mtd.h> | ||
5 | #include <linux/mtd/partitions.h> | ||
6 | |||
7 | #define ZOOM_NAND_CS 0 | 4 | #define ZOOM_NAND_CS 0 |
8 | 5 | ||
9 | extern void __init board_nand_init(struct mtd_partition *, u8 nr_parts, u8 cs); | ||
10 | extern int __init zoom_debugboard_init(void); | 6 | extern int __init zoom_debugboard_init(void); |
11 | extern void __init zoom_peripherals_init(void); | 7 | extern void __init zoom_peripherals_init(void); |
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c index 5a3e606dc44a..e13c29eecf2b 100644 --- a/arch/arm/mach-omap2/timer-gp.c +++ b/arch/arm/mach-omap2/timer-gp.c | |||
@@ -40,6 +40,8 @@ | |||
40 | #include <plat/dmtimer.h> | 40 | #include <plat/dmtimer.h> |
41 | #include <asm/localtimer.h> | 41 | #include <asm/localtimer.h> |
42 | 42 | ||
43 | #include "timer-gp.h" | ||
44 | |||
43 | /* MAX_GPTIMER_ID: number of GPTIMERs on the chip */ | 45 | /* MAX_GPTIMER_ID: number of GPTIMERs on the chip */ |
44 | #define MAX_GPTIMER_ID 12 | 46 | #define MAX_GPTIMER_ID 12 |
45 | 47 | ||
diff --git a/arch/arm/plat-omap/include/plat/timer-gp.h b/arch/arm/mach-omap2/timer-gp.h index c88d346b59d9..5c1072c6783b 100644 --- a/arch/arm/plat-omap/include/plat/timer-gp.h +++ b/arch/arm/mach-omap2/timer-gp.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #ifndef __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_TIMER_GP_H | 11 | #ifndef __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_TIMER_GP_H |
12 | #define __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_TIMER_GP_H | 12 | #define __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_TIMER_GP_H |
13 | 13 | ||
14 | int __init omap2_gp_clockevent_set_gptimer(u8 id); | 14 | extern int __init omap2_gp_clockevent_set_gptimer(u8 id); |
15 | 15 | ||
16 | #endif | 16 | #endif |
17 | |||
diff --git a/arch/arm/plat-omap/include/plat/powerdomain.h b/arch/arm/plat-omap/include/plat/powerdomain.h index 3ea722072e2f..9ca420dcd2f8 100644 --- a/arch/arm/plat-omap/include/plat/powerdomain.h +++ b/arch/arm/plat-omap/include/plat/powerdomain.h | |||
@@ -162,5 +162,6 @@ int pwrdm_state_switch(struct powerdomain *pwrdm); | |||
162 | int pwrdm_clkdm_state_switch(struct clockdomain *clkdm); | 162 | int pwrdm_clkdm_state_switch(struct clockdomain *clkdm); |
163 | int pwrdm_pre_transition(void); | 163 | int pwrdm_pre_transition(void); |
164 | int pwrdm_post_transition(void); | 164 | int pwrdm_post_transition(void); |
165 | int pwrdm_set_lowpwrstchange(struct powerdomain *pwrdm); | ||
165 | 166 | ||
166 | #endif | 167 | #endif |