debian/config/powerpc: Reorder.

svn path=/dists/trunk/linux-2.6/; revision=10777

debian/config/powerpc/config

@@ -1,3 +1,12 @@
+#
+# Platform support
+#
+CONFIG_PPC_MULTIPLATFORM=y
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
+CONFIG_PPC_PMAC=y
+
 #
 # Macintosh device drivers
 #
@@ -24,6 +33,7 @@ CONFIG_WINDFARM_PM112=m
 CONFIG_ANSLCD=m
 CONFIG_PMAC_RACKMETER=m
 
+
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_SUSPEND=y
@@ -54,14 +64,9 @@ CONFIG_CPU_FREQ_PMAC=y
 CONFIG_PPC601_SYNC_FIX=y
 CONFIG_PM=y
 CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_LOPEC is not set
 # CONFIG_PPLUS is not set
-# CONFIG_SBC82xx is not set
 # CONFIG_PPC_LITE5200 is not set
-CONFIG_PPC_CHRP=y
-CONFIG_PPC_PMAC=y
-CONFIG_PPC_PREP=y
 CONFIG_PPC_OF=y
 CONFIG_PPCBUG_NVRAM=y
 CONFIG_HIGHMEM=y
@@ -939,14 +944,10 @@ CONFIG_PPC_RTAS=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 # CONFIG_XMON_DEFAULT is not set
 # CONFIG_GENERIC_TBSYNC is not set
-# CONFIG_EMBEDDED6xx is not set
-# CONFIG_PPC_ISERIES is not set
 CONFIG_PPC_STD_MMU_32=y
 CONFIG_WATCHDOG_RTAS=m
 # CONFIG_HOTPLUG_PCI is not set
 CONFIG_RTAS_PROC=y
-# CONFIG_PPC_83xx is not set
-# CONFIG_PPC_85xx is not set
 CONFIG_XMON=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_IPW2100 is not set

debian/config/powerpc/config.powerpc

@@ -12,8 +12,19 @@ CONFIG_6xx=y
 CONFIG_ALTIVEC=y
 # CONFIG_SMP is not set
 
-CONFIG_PPC32=y
-# CONFIG_SMP is not set
+#
+# Platform support
+#
+CONFIG_PPC_CHRP=y
+# CONFIG_MPC5121_ADS is not set
+CONFIG_PPC_MPC52xx=y
+# CONFIG_PPC_MPC5200_SIMPLE is not set
+CONFIG_PPC_EFIKA=y
+CONFIG_PPC_LITE5200=y
+CONFIG_PPC_MPC5200_BUGFIX=y
+# CONFIG_PPC_PREP is not set
+
+
 CONFIG_PM_STD_PARTITION=""
 CONFIG_PCMCIA_XIRTULIP=m
 CONFIG_MAC_FLOPPY=y
@@ -32,9 +43,6 @@ CONFIG_PATA_MPC52xx=m
 CONFIG_SENSORS_AMS=m
 CONFIG_SENSORS_AMS_PMU=y
 CONFIG_SENSORS_AMS_I2C=y
-CONFIG_PPC_MPC5200_BUGFIX=y
-CONFIG_PPC_EFIKA=y
-CONFIG_PPC_LITE5200=y
 CONFIG_PPC_BESTCOMM=m
 CONFIG_PPC_BESTCOMM_ATA=m
 CONFIG_PPC_BESTCOMM_FEC=m

debian/config/powerpc/config.powerpc64

@@ -9,9 +9,23 @@ CONFIG_ALTIVEC=y
 CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_SMP=y
 
+#
+# Platform support
+#
+CONFIG_PPC_PSERIES=y
+CONFIG_PPC_SPLPAR=y
+CONFIG_SCANLOG=m
+CONFIG_LPARCFG=m
+# CONFIG_PPC_ISERIES is not set
+CONFIG_PPC_MAPLE=y
+# CONFIG_PPC_PASEMI is not set
+# CONFIG_PPC_CELLEB is not set
+# CONFIG_PPC_PS3 is not set
+# CONFIG_PPC_IBM_CELL_BLADE is not set
+
+
 CONFIG_COMPAT=y
 # CONFIG_DEBUGGER is not set
-CONFIG_EEH=y
 # CONFIG_FB_ATY128 is not set
 # CONFIG_FB_CONTROL is not set
 # CONFIG_FB_IMSTT is not set
@@ -31,7 +45,6 @@ CONFIG_IOMMU_VMERGE=y
 CONFIG_KEYS_COMPAT=y
 # CONFIG_KPROBES is not set
 CONFIG_LOCK_KERNEL=y
-CONFIG_LPARCFG=m
 CONFIG_MEGARAID_LEGACY=m
 CONFIG_NR_CPUS=32
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -45,17 +58,10 @@ CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_SPARSEMEM_EXTREME=y
 # CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_NUMA=y
-# CONFIG_POWER4_ONLY is not set
-# CONFIG_PPC_ISERIES is not set
-CONFIG_PPC_MAPLE=y
-CONFIG_PPC_PMAC64=y
-CONFIG_PPC_PSERIES=y
 CONFIG_PPC_RTAS=y
-CONFIG_PPC_SPLPAR=y
 CONFIG_RTAS_FLASH=m
 CONFIG_RTAS_PROC=y
 # CONFIG_RTC is not set
-CONFIG_SCANLOG=m
 CONFIG_SCHED_SMT=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_IBMVSCSI=m
@@ -83,12 +89,9 @@ CONFIG_MMIO_NVRAM=y
 CONFIG_PPC_CELL=y
 CONFIG_RTAS_ERROR_LOGGING=y
 CONFIG_GENERIC_TBSYNC=y
-# CONFIG_EMBEDDED6xx is not set
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 # CONFIG_PPC_64K_PAGES is not set
 # CONFIG_PPC_INDIRECT_PCI is not set
-# CONFIG_PPC_82xx is not set
-# CONFIG_PPC_83xx is not set
 CONFIG_POWER3=y
 CONFIG_POWER4=y
 CONFIG_WINDFARM=m