diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/mux34xx.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-omap2/mux44xx.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/mux34xx.c b/arch/arm/mach-omap2/mux34xx.c index 440c98e9a510..17f80e4ab162 100644 --- a/arch/arm/mach-omap2/mux34xx.c +++ b/arch/arm/mach-omap2/mux34xx.c | |||
@@ -703,7 +703,7 @@ static struct omap_mux __initdata omap3_muxmodes[] = { | |||
703 | * Signals different on CBC package compared to the superset | 703 | * Signals different on CBC package compared to the superset |
704 | */ | 704 | */ |
705 | #if defined(CONFIG_OMAP_MUX) && defined(CONFIG_OMAP_PACKAGE_CBC) | 705 | #if defined(CONFIG_OMAP_MUX) && defined(CONFIG_OMAP_PACKAGE_CBC) |
706 | struct omap_mux __initdata omap3_cbc_subset[] = { | 706 | static struct omap_mux __initdata omap3_cbc_subset[] = { |
707 | { .reg_offset = OMAP_MUX_TERMINATOR }, | 707 | { .reg_offset = OMAP_MUX_TERMINATOR }, |
708 | }; | 708 | }; |
709 | #else | 709 | #else |
@@ -721,7 +721,7 @@ struct omap_mux __initdata omap3_cbc_subset[] = { | |||
721 | */ | 721 | */ |
722 | #if defined(CONFIG_OMAP_MUX) && defined(CONFIG_DEBUG_FS) \ | 722 | #if defined(CONFIG_OMAP_MUX) && defined(CONFIG_DEBUG_FS) \ |
723 | && defined(CONFIG_OMAP_PACKAGE_CBC) | 723 | && defined(CONFIG_OMAP_PACKAGE_CBC) |
724 | struct omap_ball __initdata omap3_cbc_ball[] = { | 724 | static struct omap_ball __initdata omap3_cbc_ball[] = { |
725 | _OMAP3_BALLENTRY(CAM_D0, "ae16", NULL), | 725 | _OMAP3_BALLENTRY(CAM_D0, "ae16", NULL), |
726 | _OMAP3_BALLENTRY(CAM_D1, "ae15", NULL), | 726 | _OMAP3_BALLENTRY(CAM_D1, "ae15", NULL), |
727 | _OMAP3_BALLENTRY(CAM_D10, "d25", NULL), | 727 | _OMAP3_BALLENTRY(CAM_D10, "d25", NULL), |
diff --git a/arch/arm/mach-omap2/mux44xx.c b/arch/arm/mach-omap2/mux44xx.c index 980f11d45c79..c322e7bdaa17 100644 --- a/arch/arm/mach-omap2/mux44xx.c +++ b/arch/arm/mach-omap2/mux44xx.c | |||
@@ -544,7 +544,7 @@ static struct omap_mux __initdata omap4_core_muxmodes[] = { | |||
544 | */ | 544 | */ |
545 | #if defined(CONFIG_OMAP_MUX) && defined(CONFIG_DEBUG_FS) \ | 545 | #if defined(CONFIG_OMAP_MUX) && defined(CONFIG_DEBUG_FS) \ |
546 | && defined(CONFIG_OMAP_PACKAGE_CBL) | 546 | && defined(CONFIG_OMAP_PACKAGE_CBL) |
547 | struct omap_ball __initdata omap4_core_cbl_ball[] = { | 547 | static struct omap_ball __initdata omap4_core_cbl_ball[] = { |
548 | _OMAP4_BALLENTRY(GPMC_AD0, "c12", NULL), | 548 | _OMAP4_BALLENTRY(GPMC_AD0, "c12", NULL), |
549 | _OMAP4_BALLENTRY(GPMC_AD1, "d12", NULL), | 549 | _OMAP4_BALLENTRY(GPMC_AD1, "d12", NULL), |
550 | _OMAP4_BALLENTRY(GPMC_AD2, "c13", NULL), | 550 | _OMAP4_BALLENTRY(GPMC_AD2, "c13", NULL), |
@@ -1262,7 +1262,7 @@ static struct omap_mux __initdata omap4_es2_core_muxmodes[] = { | |||
1262 | */ | 1262 | */ |
1263 | #if defined(CONFIG_OMAP_MUX) && defined(CONFIG_DEBUG_FS) \ | 1263 | #if defined(CONFIG_OMAP_MUX) && defined(CONFIG_DEBUG_FS) \ |
1264 | && defined(CONFIG_OMAP_PACKAGE_CBS) | 1264 | && defined(CONFIG_OMAP_PACKAGE_CBS) |
1265 | struct omap_ball __initdata omap4_core_cbs_ball[] = { | 1265 | static struct omap_ball __initdata omap4_core_cbs_ball[] = { |
1266 | _OMAP4_BALLENTRY(GPMC_AD0, "c12", NULL), | 1266 | _OMAP4_BALLENTRY(GPMC_AD0, "c12", NULL), |
1267 | _OMAP4_BALLENTRY(GPMC_AD1, "d12", NULL), | 1267 | _OMAP4_BALLENTRY(GPMC_AD1, "d12", NULL), |
1268 | _OMAP4_BALLENTRY(GPMC_AD2, "c13", NULL), | 1268 | _OMAP4_BALLENTRY(GPMC_AD2, "c13", NULL), |
@@ -1546,7 +1546,7 @@ static struct omap_mux __initdata omap4_wkup_muxmodes[] = { | |||
1546 | */ | 1546 | */ |
1547 | #if defined(CONFIG_OMAP_MUX) && defined(CONFIG_DEBUG_FS) \ | 1547 | #if defined(CONFIG_OMAP_MUX) && defined(CONFIG_DEBUG_FS) \ |
1548 | && defined(CONFIG_OMAP_PACKAGE_CBL) | 1548 | && defined(CONFIG_OMAP_PACKAGE_CBL) |
1549 | struct omap_ball __initdata omap4_wkup_cbl_cbs_ball[] = { | 1549 | static struct omap_ball __initdata omap4_wkup_cbl_cbs_ball[] = { |
1550 | _OMAP4_BALLENTRY(SIM_IO, "h4", NULL), | 1550 | _OMAP4_BALLENTRY(SIM_IO, "h4", NULL), |
1551 | _OMAP4_BALLENTRY(SIM_CLK, "j2", NULL), | 1551 | _OMAP4_BALLENTRY(SIM_CLK, "j2", NULL), |
1552 | _OMAP4_BALLENTRY(SIM_RESET, "g2", NULL), | 1552 | _OMAP4_BALLENTRY(SIM_RESET, "g2", NULL), |