Diff
Modified: trunk/arch/blackfin/mach-bf518/boards/ezbrd.c (8909 => 8910)
--- trunk/arch/blackfin/mach-bf518/boards/ezbrd.c 2010-06-12 09:48:23 UTC (rev 8909)
+++ trunk/arch/blackfin/mach-bf518/boards/ezbrd.c 2010-06-13 04:39:31 UTC (rev 8910)
@@ -87,39 +87,18 @@
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
-static unsigned short bfin_mac_peripherals[] = {
-#if defined(CONFIG_BFIN_MAC_RMII)
+static const unsigned short bfin_mac_peripherals[] = {
P_MII0_ETxD0,
P_MII0_ETxD1,
- P_MII0_ETxD2,
- P_MII0_ETxD3,
P_MII0_ETxEN,
- P_MII0_TxCLK,
- P_MII0_PHYINT,
- P_MII0_COL,
P_MII0_ERxD0,
P_MII0_ERxD1,
- P_MII0_ERxD2,
- P_MII0_ERxD3,
- P_MII0_ERxDV,
- P_MII0_ERxCLK,
- P_MII0_CRS,
- P_MII0_MDC,
- P_MII0_MDIO,
- 0
-#else
- P_MII0_ETxD0,
- P_MII0_ETxD1,
- P_MII0_ETxEN,
- P_MII0_ERxD0,
- P_MII0_ERxD1,
P_MII0_TxCLK,
P_MII0_PHYINT,
P_MII0_CRS,
P_MII0_MDC,
P_MII0_MDIO,
0
-#endif
};
static struct platform_device bfin_mii_bus = {
Modified: trunk/arch/blackfin/mach-bf518/boards/tcm-bf518.c (8909 => 8910)
--- trunk/arch/blackfin/mach-bf518/boards/tcm-bf518.c 2010-06-12 09:48:23 UTC (rev 8909)
+++ trunk/arch/blackfin/mach-bf518/boards/tcm-bf518.c 2010-06-13 04:39:31 UTC (rev 8910)
@@ -81,12 +81,7 @@
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
-static unsigned short bfin_mac_peripherals[] =
-#if defined(CONFIG_BFIN_MAC_RMII)
- P_RMII0;
-#else
- P_MII0;
-#endif
+static const unsigned short bfin_mac_peripherals[] = P_MII0;
static struct platform_device bfin_mii_bus = {
.name = "bfin_mii_bus",
Modified: trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c (8909 => 8910)
--- trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c 2010-06-12 09:48:23 UTC (rev 8909)
+++ trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c 2010-06-13 04:39:31 UTC (rev 8910)
@@ -273,12 +273,7 @@
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
-static unsigned short bfin_mac_peripherals[] =
-#if defined(CONFIG_BFIN_MAC_RMII)
- P_RMII0;
-#else
- P_MII0;
-#endif
+static const unsigned short bfin_mac_peripherals[] = P_RMII0;
static struct platform_device bfin_mii_bus = {
.name = "bfin_mii_bus",
Modified: trunk/arch/blackfin/mach-bf527/boards/ezbrd.c (8909 => 8910)
--- trunk/arch/blackfin/mach-bf527/boards/ezbrd.c 2010-06-12 09:48:23 UTC (rev 8909)
+++ trunk/arch/blackfin/mach-bf527/boards/ezbrd.c 2010-06-13 04:39:31 UTC (rev 8910)
@@ -190,12 +190,7 @@
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
-static unsigned short bfin_mac_peripherals[] =
-#if defined(CONFIG_BFIN_MAC_RMII)
- P_RMII0;
-#else
- P_MII0;
-#endif
+static const unsigned short bfin_mac_peripherals[] = P_RMII0;
static struct platform_device bfin_mii_bus = {
.name = "bfin_mii_bus",
Modified: trunk/arch/blackfin/mach-bf527/boards/ezkit.c (8909 => 8910)
--- trunk/arch/blackfin/mach-bf527/boards/ezkit.c 2010-06-12 09:48:23 UTC (rev 8909)
+++ trunk/arch/blackfin/mach-bf527/boards/ezkit.c 2010-06-13 04:39:31 UTC (rev 8910)
@@ -362,12 +362,7 @@
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
-static unsigned short bfin_mac_peripherals[] =
-#if defined(CONFIG_BFIN_MAC_RMII)
- P_RMII0;
-#else
- P_MII0;
-#endif
+static const unsigned short bfin_mac_peripherals[] = P_RMII0;
static struct platform_device bfin_mii_bus = {
.name = "bfin_mii_bus",
Modified: trunk/arch/blackfin/mach-bf537/boards/cm_bf537e.c (8909 => 8910)
--- trunk/arch/blackfin/mach-bf537/boards/cm_bf537e.c 2010-06-12 09:48:23 UTC (rev 8909)
+++ trunk/arch/blackfin/mach-bf537/boards/cm_bf537e.c 2010-06-13 04:39:31 UTC (rev 8910)
@@ -597,12 +597,7 @@
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
-static unsigned short bfin_mac_peripherals[] =
-#if defined(CONFIG_BFIN_MAC_RMII)
- P_RMII0;
-#else
- P_MII0;
-#endif
+static const unsigned short bfin_mac_peripherals[] = P_MII0;
static struct platform_device bfin_mii_bus = {
.name = "bfin_mii_bus",
Modified: trunk/arch/blackfin/mach-bf537/boards/cm_bf537u.c (8909 => 8910)
--- trunk/arch/blackfin/mach-bf537/boards/cm_bf537u.c 2010-06-12 09:48:23 UTC (rev 8909)
+++ trunk/arch/blackfin/mach-bf537/boards/cm_bf537u.c 2010-06-13 04:39:31 UTC (rev 8910)
@@ -562,12 +562,7 @@
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
-static unsigned short bfin_mac_peripherals[] =
-#if defined(CONFIG_BFIN_MAC_RMII)
- P_RMII0;
-#else
- P_MII0;
-#endif
+static const unsigned short bfin_mac_peripherals[] = P_MII0;
static struct platform_device bfin_mii_bus = {
.name = "bfin_mii_bus",
Modified: trunk/arch/blackfin/mach-bf537/boards/minotaur.c (8909 => 8910)
--- trunk/arch/blackfin/mach-bf537/boards/minotaur.c 2010-06-12 09:48:23 UTC (rev 8909)
+++ trunk/arch/blackfin/mach-bf537/boards/minotaur.c 2010-06-13 04:39:31 UTC (rev 8910)
@@ -68,12 +68,7 @@
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
-static unsigned short bfin_mac_peripherals[] =
-#if defined(CONFIG_BFIN_MAC_RMII)
- P_RMII0;
-#else
- P_MII0;
-#endif
+static const unsigned short bfin_mac_peripherals[] = P_MII0;
static struct platform_device bfin_mii_bus = {
.name = "bfin_mii_bus",
Modified: trunk/arch/blackfin/mach-bf537/boards/pnav10.c (8909 => 8910)
--- trunk/arch/blackfin/mach-bf537/boards/pnav10.c 2010-06-12 09:48:23 UTC (rev 8909)
+++ trunk/arch/blackfin/mach-bf537/boards/pnav10.c 2010-06-13 04:39:31 UTC (rev 8910)
@@ -99,12 +99,7 @@
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
-static unsigned short bfin_mac_peripherals[] =
-#if defined(CONFIG_BFIN_MAC_RMII)
- P_RMII0;
-#else
- P_MII0;
-#endif
+static const unsigned short bfin_mac_peripherals[] = P_RMII0;
static struct platform_device bfin_mii_bus = {
.name = "bfin_mii_bus",
Modified: trunk/arch/blackfin/mach-bf537/boards/stamp.c (8909 => 8910)
--- trunk/arch/blackfin/mach-bf537/boards/stamp.c 2010-06-12 09:48:23 UTC (rev 8909)
+++ trunk/arch/blackfin/mach-bf537/boards/stamp.c 2010-06-13 04:39:31 UTC (rev 8910)
@@ -327,12 +327,7 @@
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
-static unsigned short bfin_mac_peripherals[] =
-#if defined(CONFIG_BFIN_MAC_RMII)
- P_RMII0;
-#else
- P_MII0;
-#endif
+static const unsigned short bfin_mac_peripherals[] = P_MII0;
static struct platform_device bfin_mii_bus = {
.name = "bfin_mii_bus",
Modified: trunk/arch/blackfin/mach-bf537/boards/tcm_bf537.c (8909 => 8910)
--- trunk/arch/blackfin/mach-bf537/boards/tcm_bf537.c 2010-06-12 09:48:23 UTC (rev 8909)
+++ trunk/arch/blackfin/mach-bf537/boards/tcm_bf537.c 2010-06-13 04:39:31 UTC (rev 8910)
@@ -564,12 +564,7 @@
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
-static unsigned short bfin_mac_peripherals[] =
-#if defined(CONFIG_BFIN_MAC_RMII)
- P_RMII0;
-#else
- P_MII0;
-#endif
+static const unsigned short bfin_mac_peripherals[] = P_MII0;
static struct platform_device bfin_mii_bus = {
.name = "bfin_mii_bus",
