Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks

Conflicts:

	drivers/pci/quirks.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 5 insertions, 20 deletions

diff --git a/include/asm-mips/namei.h b/include/asm-mips/namei.h
index c94d12d1f868..a6605a752469 100644
--- a/include/asm-mips/namei.h
+++ b/include/asm-mips/namei.h
@@ -1,26 +1,11 @@
 #ifndef _ASM_NAMEI_H
 #define _ASM_NAMEI_H
 
-#include <linux/personality.h>
-#include <linux/stddef.h>
+/*
+ * This dummy routine maybe changed to something useful
+ * for /usr/gnemul/ emulation stuff.
+ */
 
-#define IRIX_EMUL       "/usr/gnemul/irix/"
-#define RISCOS_EMUL     "/usr/gnemul/riscos/"
-
-static inline char *__emul_prefix(void)
-{
-        switch (current->personality) {
-        case PER_IRIX32:
-        case PER_IRIXN32:
-        case PER_IRIX64:
-                return IRIX_EMUL;
-
-        case PER_RISCOS:
-                return RISCOS_EMUL;
-
-        default:
-                return NULL;
-        }
-}
+#define __emul_prefix() NULL
 
 #endif /* _ASM_NAMEI_H */