Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / arch / um / sys-ppc / misc.S

diff --git a/arch/um/sys-ppc/misc.S b/arch/um/sys-ppc/misc.S
index 11b7bd768cfd9e585085f15f156a12775fc89a73..1364b7da578c000f937a3253c2265a9dbf6494f5 100644 (file)
--- a/arch/um/sys-ppc/misc.S
+++ b/arch/um/sys-ppc/misc.S
@@ -15,7 +15,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <asm/processor.h>
 #include "ppc_asm.h"
 
@@ -23,14 +22,10 @@
 #define CACHE_LINE_SIZE                16
 #define LG_CACHE_LINE_SIZE     4
 #define MAX_COPY_PREFETCH      1
-#elif !defined(CONFIG_PPC64BRIDGE)
+#else
 #define CACHE_LINE_SIZE                32
 #define LG_CACHE_LINE_SIZE     5
 #define MAX_COPY_PREFETCH      4
-#else
-#define CACHE_LINE_SIZE                128
-#define LG_CACHE_LINE_SIZE     7
-#define MAX_COPY_PREFETCH      1
 #endif /* CONFIG_4xx || CONFIG_8xx */
 
        .text