Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / include / asm-sh64 / bug.h

diff --git a/include/asm-sh64/bug.h b/include/asm-sh64/bug.h
index 3acd54d5956608b199057b8b3a2e9c3a7291e9de..81f722efeb6352de0145c68a88e823a0eaccc91c 100644 (file)
--- a/include/asm-sh64/bug.h
+++ b/include/asm-sh64/bug.h
@@ -1,7 +1,6 @@
 #ifndef __ASM_SH64_BUG_H
 #define __ASM_SH64_BUG_H
 
-#include <linux/config.h>
 
 /*
  * Tell the user there is some problem, then force a segfault (in process
@@ -17,10 +16,6 @@
                BUG(); \
 } while(0)
 
-#define PAGE_BUG(page) do { \
-       BUG(); \
-} while (0)
-
 #define WARN_ON(condition) do { \
        if (unlikely((condition)!=0)) { \
                printk("Badness in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \