svn_rev_530

remove linux/config.h

8 files changed, 2 insertions, 22 deletions

diff --git a/include/asm-ppc/bitops.h b/include/asm-ppc/bitops.h
index 3264915d89..64da33a717 100644
--- a/include/asm-ppc/bitops.h
+++ b/include/asm-ppc/bitops.h
@@ -5,7 +5,6 @@
 #ifndef _PPC_BITOPS_H
 #define _PPC_BITOPS_H
 
-#include <linux/config.h>
 #include <asm/byteorder.h>
 
 extern void set_bit(int nr, volatile void *addr);
diff --git a/include/asm-ppc/cache.h b/include/asm-ppc/cache.h
index 5befab4d53..f37af97c07 100644
--- a/include/asm-ppc/cache.h
+++ b/include/asm-ppc/cache.h
@@ -4,7 +4,6 @@
 #ifndef __ARCH_PPC_CACHE_H
 #define __ARCH_PPC_CACHE_H
 
-#include <linux/config.h>
 #include <asm/processor.h>
 
 /* bytes per L1 cache line */
diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h
index 8e5fe113cb..73b4ab90b9 100644
--- a/include/asm-ppc/io.h
+++ b/include/asm-ppc/io.h
@@ -7,7 +7,6 @@
 #ifndef _PPC_IO_H
 #define _PPC_IO_H
 
-#include <linux/config.h>
 #include <asm/byteorder.h>
 
 #define SIO_CONFIG_RA   0x398
diff --git a/include/asm-ppc/mmu.h b/include/asm-ppc/mmu.h
index 914f28b461..1667041a8c 100644
--- a/include/asm-ppc/mmu.h
+++ b/include/asm-ppc/mmu.h
@@ -5,8 +5,6 @@
 #ifndef _PPC_MMU_H_
 #define _PPC_MMU_H_
 
-#include <linux/config.h>
-
 #ifndef __ASSEMBLY__
 /* Hardware Page Table Entry */
 typedef struct _PTE {
diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h
index 6619686876..b336f48b78 100644
--- a/include/asm-ppc/processor.h
+++ b/include/asm-ppc/processor.h
@@ -7,8 +7,6 @@
  */
 #define current_text_addr() ({ __label__ _l; _l: &&_l;})
 
-#include <linux/config.h>
-
 #include <asm/ptrace.h>
 #include <asm/types.h>
 
diff --git a/include/asm-ppc/ptrace.h b/include/asm-ppc/ptrace.h
index 3c2f4e605a..b4d599f43b 100644
--- a/include/asm-ppc/ptrace.h
+++ b/include/asm-ppc/ptrace.h
@@ -17,7 +17,6 @@
  * the PT_* values below.  This simplifies arch/ppc/kernel/ptrace.c.
  */
 
-#include <linux/config.h>
 
 #ifndef __ASSEMBLY__
 #ifdef CONFIG_PPC64BRIDGE
diff --git a/include/configs/phycore_mpc5200b_tiny.h b/include/configs/phycore_mpc5200b_tiny.h
index 7ba7034fba..d6c35e2d5a 100644
--- a/include/configs/phycore_mpc5200b_tiny.h
+++ b/include/configs/phycore_mpc5200b_tiny.h
@@ -55,10 +55,6 @@ Serial console configuration
 #endif
 /* RAMBOOT will be defined automatically in memory section */
 
-#define CONFIG_PREBOOT	"echo;"	\
-	"echo Type \"run net_nfs\" to load Kernel over TFTP and to mount root filesystem over NFS;" \
-	"echo"
-
 /*------------------------------------------------------------------------------------------------------------------------------------------------------
 IPB Bus clocking configuration.
  ------------------------------------------------------------------------------------------------------------------------------------------------------*/
@@ -104,14 +100,10 @@ RTC configuration
 #define CFG_BOOTCS_START	0xFF000000
 #define CFG_BOOTCS_SIZE		0x01000000
 
-#define PHYCORE_MPC5200B_TINY_REV 0
-
-#if PHYCORE_MPC5200B_TINY_REV == 0
-#define CFG_BOOTCS_CFG		0x00083800
-#elif PHYCORE_MPC5200B_TINY_REV == 1
+#ifdef CONFIG_MACH_PHYCORE_MPC5200B_TINY_REV_1
 #define CFG_BOOTCS_CFG		0x0008FD00
 #else
-#error "PHYCORE_MPC5200B_TINY_REV not specified"
+#define CFG_BOOTCS_CFG		0x00083800
 #endif
 
 /*------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/include/linux/types.h b/include/linux/types.h
index 5e9213614d..9346a7d608 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -1,10 +1,6 @@
 #ifndef _LINUX_TYPES_H
 #define _LINUX_TYPES_H
 
-#ifdef	__KERNEL__
-#include <linux/config.h>
-#endif
-
 #include <linux/posix_types.h>
 #include <asm/types.h>