Merge branch 'linux-2.6'

2 files changed, 2 insertions, 19 deletions

diff --git a/arch/mips/nxp/pnx8550/jbs/board_setup.c b/arch/mips/nxp/pnx8550/jbs/board_setup.c
index f92826e0096d..57dd903ca408 100644
--- a/arch/mips/nxp/pnx8550/jbs/board_setup.c
+++ b/arch/mips/nxp/pnx8550/jbs/board_setup.c
@@ -47,16 +47,7 @@
 
 void __init board_setup(void)
 {
-        unsigned long config0, configpr;
-
-        config0 = read_c0_config();
-
-        /* clear all three cache coherency fields */
-        config0 &= ~(0x7 | (7<<25) | (7<<28));
-        config0 |= (CONF_CM_DEFAULT | (CONF_CM_DEFAULT<<25) |
-                        (CONF_CM_DEFAULT<<28));
-        write_c0_config(config0);
-        BARRIER;
+        unsigned long configpr;
 
         configpr = read_c0_config7();
         configpr |= (1<<19); /* enable tlb */
diff --git a/arch/mips/nxp/pnx8550/stb810/board_setup.c b/arch/mips/nxp/pnx8550/stb810/board_setup.c
index 1282c27cfcb7..af2a55e0b4e9 100644
--- a/arch/mips/nxp/pnx8550/stb810/board_setup.c
+++ b/arch/mips/nxp/pnx8550/stb810/board_setup.c
@@ -33,15 +33,7 @@
 
 void __init board_setup(void)
 {
-        unsigned long config0, configpr;
-
-        config0 = read_c0_config();
-
-        /* clear all three cache coherency fields */
-        config0 &= ~(0x7 | (7<<25) | (7<<28));
-        config0 |= (CONF_CM_DEFAULT | (CONF_CM_DEFAULT<<25) |
-                        (CONF_CM_DEFAULT<<28));
-        write_c0_config(config0);
+        unsigned long configpr;
 
         configpr = read_c0_config7();
         configpr |= (1<<19); /* enable tlb */