[kernel] r5104 - dists/trunk/linux-2.6/debian/arch/powerpc

[Sven Luther]

Author: luther
Date: Wed Dec 28 20:44:51 2005
New Revision: 5104

Modified:
   dists/trunk/linux-2.6/debian/arch/powerpc/config
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-smp
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64
Log:
Fixed powerpc configs for powerpc64 builds.


Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config	Wed Dec 28 20:44:51 2005
@@ -2,7 +2,6 @@
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_HAVE_DEC_LOCK=y
 CONFIG_PPC=y
-CONFIG_PPC32=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_CLEAN_COMPILE=y
@@ -872,12 +871,8 @@
 # CONFIG_FB_PM2 is not set
 # CONFIG_FB_CYBER2000 is not set
 CONFIG_FB_OF=y
-CONFIG_FB_CONTROL=y
-CONFIG_FB_PLATINUM=y
-CONFIG_FB_VALKYRIE=y
 CONFIG_FB_CT65550=y
 # CONFIG_FB_ASILIANT is not set
-CONFIG_FB_IMSTT=y
 # CONFIG_FB_VGA16 is not set
 CONFIG_FB_NVIDIA=y
 # CONFIG_FB_RIVA is not set
@@ -1276,7 +1271,6 @@
 CONFIG_RTAS_PROC=y
 # CONFIG_PPC_52xx is not set
 # CONFIG_PPC_83xx is not set
-# CONFIG_PPC64 is not set
 CONFIG_XMON=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc	Wed Dec 28 20:44:51 2005
@@ -1,3 +1,4 @@
+CONFIG_PPC32=y
 CONFIG_BROKEN_ON_SMP=y
 # CONFIG_SMP is not set
 CONFIG_PM_STD_PARTITION=""
@@ -6,4 +7,8 @@
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_MAC_FLOPPY=y
 CONFIG_FLATMEM_MANUAL=y
+CONFIG_FB_CONTROL=y
+CONFIG_FB_PLATINUM=y
+CONFIG_FB_VALKYRIE=y
+ONFIG_FB_IMSTT=y
 

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot	Wed Dec 28 20:44:51 2005
@@ -1,3 +1,4 @@
+CONFIG_PPC32=y
 CONFIG_MAC_FLOPPY=y
 # CONFIG_SMP is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
@@ -75,4 +76,8 @@
 CONFIG_DEFAULT_DEADLINE=y
 CONFIG_DEFAULT_IOSCHED="deadline"
 CONFIG_FLATMEM_MANUAL=y
+CONFIG_FB_CONTROL=y
+CONFIG_FB_PLATINUM=y
+CONFIG_FB_VALKYRIE=y
+CONFIG_FB_IMSTT=y
 

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-smp	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-smp	Wed Dec 28 20:44:51 2005
@@ -1,3 +1,4 @@
+CONFIG_PPC32=y
 CONFIG_LOCK_KERNEL=y
 # CONFIG_CPUSETS is not set
 CONFIG_STOP_MACHINE=y
@@ -6,4 +7,8 @@
 CONFIG_NR_CPUS=4
 # CONFIG_MAC_FLOPPY is not set
 CONFIG_FLATMEM_MANUAL=y
+CONFIG_FB_CONTROL=y
+CONFIG_FB_PLATINUM=y
+CONFIG_FB_VALKYRIE=y
+CONFIG_FB_IMSTT=y
 

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64	Wed Dec 28 20:44:51 2005
@@ -1,3 +1,4 @@
+CONFIG_PPC64=y
 CONFIG_64BIT=y
 CONFIG_COMPAT=y
 CONFIG_CPUSETS=y