mpc83xx: clean up the mess caused by the reverted sorting patch

SVN-Revision: 19676

1 files changed, 81 insertions, 81 deletions

diff --git a/target/linux/mpc83xx/config-2.6.32 b/target/linux/mpc83xx/config-2.6.32
index 97b3280600..030a7b4116 100644
--- a/target/linux/mpc83xx/config-2.6.32
+++ b/target/linux/mpc83xx/config-2.6.32
@@ -1,103 +1,28 @@
 # CONFIG_40x is not set
 # CONFIG_44x is not set
+CONFIG_6xx=y
 # CONFIG_8xxx_WDT is not set
 # CONFIG_ADVANCED_OPTIONS is not set
 # CONFIG_ALTIVEC is not set
 # CONFIG_AMIGAONE is not set
-# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-# CONFIG_ASP834x is not set
-# CONFIG_BOOTX_TEXT is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_E200 is not set
-# CONFIG_EMBEDDED6xx is not set
-# CONFIG_FSL_EMB_PERFMON is not set
-# CONFIG_FSL_ULI1575 is not set
-# CONFIG_FSNOTIFY is not set
-# CONFIG_GENERIC_IOMAP is not set
-# CONFIG_GENERIC_TBSYNC is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_HAS_RAPIDIO is not set
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-# CONFIG_HZ_100 is not set
-# CONFIG_IOMMU_HELPER is not set
-# CONFIG_IRQSTACKS is not set
-# CONFIG_KMETER1 is not set
-# CONFIG_LEDS_GPIO is not set
-# CONFIG_MMIO_NVRAM is not set
-# CONFIG_MPC5121_ADS is not set
-# CONFIG_MPC5121_GENERIC is not set
-# CONFIG_MPC832x_MDS is not set
-# CONFIG_MPC832x_RDB is not set
-# CONFIG_MPC834x_ITX is not set
-# CONFIG_MPC834x_MDS is not set
-# CONFIG_MPC836x_MDS is not set
-# CONFIG_MPC836x_RDK is not set
-# CONFIG_MPC837x_MDS is not set
-# CONFIG_MPC8xxx_GPIO is not set
-# CONFIG_MPIC is not set
-# CONFIG_MPIC_WEIRD is not set
-# CONFIG_MTD_NAND_FSL_ELBC is not set
-# CONFIG_MTD_NAND_FSL_UPM is not set
-# CONFIG_MV643XX_ETH is not set
-# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
-# CONFIG_PCIEAER_INJECT is not set
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PERF_COUNTERS is not set
-# CONFIG_PERF_EVENTS is not set
-# CONFIG_PPC64 is not set
-# CONFIG_PPC_82xx is not set
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_PPC_970_NAP is not set
-# CONFIG_PPC_CELL is not set
-# CONFIG_PPC_CELL_NATIVE is not set
-# CONFIG_PPC_CHRP is not set
-# CONFIG_PPC_CLOCK is not set
-# CONFIG_PPC_DCR_MMIO is not set
-# CONFIG_PPC_DCR_NATIVE is not set
-# CONFIG_PPC_EARLY_DEBUG is not set
-# CONFIG_PPC_I8259 is not set
-# CONFIG_PPC_INDIRECT_IO is not set
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_PPC_MPC106 is not set
-# CONFIG_PPC_MPC52xx is not set
-# CONFIG_PPC_PMAC is not set
-# CONFIG_PPC_RTAS is not set
-# CONFIG_PQ2ADS is not set
-# CONFIG_SATA_FSL is not set
-# CONFIG_SBC834x is not set
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-# CONFIG_SERIAL_8250_MANY_PORTS is not set
-# CONFIG_SERIAL_8250_RSA is not set
-# CONFIG_SERIAL_QE is not set
-# CONFIG_SWIOTLB is not set
-# CONFIG_TAU is not set
-# CONFIG_TREE_PREEMPT_RCU is not set
-# CONFIG_UCC_GETH is not set
-# CONFIG_XILINX_EMACLITE is not set
-# CONFIG_YAFFS_9BYTE_TAGS is not set
-# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
-# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-# CONFIG_YAFFS_DOES_ECC is not set
-CONFIG_6xx=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_ARCH_HAS_WALK_MEMORY=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
 CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+# CONFIG_ASP834x is not set
 CONFIG_ATA=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_BITREVERSE=y
+# CONFIG_BOOTX_TEXT is not set
 CONFIG_BOUNCE=y
 CONFIG_BUBBATWO=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -107,13 +32,19 @@ CONFIG_CMDLINE_BOOL=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEFAULT_UIMAGE=y
 CONFIG_DEVPORT=y
+# CONFIG_DMA_API_DEBUG is not set
 CONFIG_DTC=y
+# CONFIG_E200 is not set
 CONFIG_EARLY_PRINTK=y
+# CONFIG_EMBEDDED6xx is not set
 CONFIG_EXTRA_TARGETS="uImage.fit.mpc8377_wlan"
 CONFIG_FORCE_MAX_ZONEORDER=11
+# CONFIG_FSL_EMB_PERFMON is not set
 CONFIG_FSL_PCI=y
 CONFIG_FSL_PQ_MDIO=y
 CONFIG_FSL_SOC=y
+# CONFIG_FSL_ULI1575 is not set
+# CONFIG_FSNOTIFY is not set
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
@@ -123,14 +54,18 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+# CONFIG_GENERIC_IOMAP is not set
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_NVRAM=y
+# CONFIG_GENERIC_TBSYNC is not set
 CONFIG_GENERIC_TIME_VSYSCALL=y
+# CONFIG_GEN_RTC is not set
 CONFIG_GIANFAR=y
 CONFIG_GPIOLIB=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+# CONFIG_HAS_RAPIDIO is not set
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
@@ -140,6 +75,7 @@ CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_HAVE_IDE=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
@@ -148,22 +84,45 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_LMB=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_PERF_EVENTS=y
+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
 CONFIG_HW_RANDOM=y
 CONFIG_HZ=250
+# CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_IOMMU_HELPER is not set
 CONFIG_IPIC=y
+# CONFIG_IRQSTACKS is not set
 CONFIG_IRQ_PER_CPU=y
 CONFIG_ISA_DMA_API=y
 CONFIG_KERNEL_START=0xc0000000
+# CONFIG_KMETER1 is not set
+# CONFIG_LEDS_GPIO is not set
 CONFIG_LOWMEM_SIZE=0x30000000
 CONFIG_MAX_ACTIVE_REGIONS=32
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_MPC5121_ADS is not set
+# CONFIG_MPC5121_GENERIC is not set
 CONFIG_MPC831x_RDB=y
+# CONFIG_MPC832x_MDS is not set
+# CONFIG_MPC832x_RDB is not set
+# CONFIG_MPC834x_ITX is not set
+# CONFIG_MPC834x_MDS is not set
+# CONFIG_MPC836x_MDS is not set
+# CONFIG_MPC836x_RDK is not set
+# CONFIG_MPC837x_MDS is not set
 CONFIG_MPC837x_RDB=y
+# CONFIG_MPC8xxx_GPIO is not set
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
 CONFIG_MTD_NAND=y
+# CONFIG_MTD_NAND_FSL_ELBC is not set
+# CONFIG_MTD_NAND_FSL_UPM is not set
 CONFIG_MTD_NAND_RB_PPC=y
 CONFIG_MTD_OF_PARTS=y
 CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MV643XX_ETH is not set
+# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
 CONFIG_OF=y
 CONFIG_OF_DEVICE=y
 CONFIG_OF_GPIO=y
@@ -172,30 +131,55 @@ CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc0000000
 CONFIG_PATA_RB_PPC=m
 CONFIG_PCIEAER=y
+# CONFIG_PCIEAER_INJECT is not set
 CONFIG_PCIEPORTBUS=y
+# CONFIG_PCIE_ECRC is not set
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_PERF_EVENTS is not set
 CONFIG_PHYLIB=y
 CONFIG_PHYSICAL_START=0x00000000
-CONFIG_PPC32=y
 CONFIG_PPC=y
+CONFIG_PPC32=y
+# CONFIG_PPC64 is not set
+# CONFIG_PPC_82xx is not set
 CONFIG_PPC_83xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_86xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_PPC_970_NAP is not set
 CONFIG_PPC_BOOK3S=y
 CONFIG_PPC_BOOK3S_32=y
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_CLOCK is not set
+# CONFIG_PPC_DCR_MMIO is not set
+# CONFIG_PPC_DCR_NATIVE is not set
 CONFIG_PPC_DISABLE_WERROR=y
+# CONFIG_PPC_EARLY_DEBUG is not set
 CONFIG_PPC_FPU=y
 CONFIG_PPC_HAVE_PMU_SUPPORT=y
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_INDIRECT_IO is not set
 CONFIG_PPC_INDIRECT_PCI=y
 CONFIG_PPC_LIB_RHEAP=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_MPC52xx is not set
 CONFIG_PPC_MPC831x=y
 CONFIG_PPC_MPC834x=y
 CONFIG_PPC_MPC837x=y
 CONFIG_PPC_OF=y
 CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
 CONFIG_PPC_PCI_CHOICE=y
+# CONFIG_PPC_PMAC is not set
+# CONFIG_PPC_RTAS is not set
 CONFIG_PPC_STD_MMU=y
 CONFIG_PPC_STD_MMU_32=y
 CONFIG_PPC_UDBG_16550=y
+# CONFIG_PQ2ADS is not set
 CONFIG_PRINT_STACK_DEPTH=64
 CONFIG_PROC_DEVICETREE=y
 CONFIG_QE_GPIO=y
@@ -203,18 +187,34 @@ CONFIG_QUICC_ENGINE=y
 CONFIG_RB_IOMAP=y
 CONFIG_RB_PPC=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+# CONFIG_SATA_FSL is not set
+# CONFIG_SBC834x is not set
 CONFIG_SCHED_HRTICK=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_SCSI=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
 CONFIG_SERIAL_8250_EXTENDED=y
+# CONFIG_SERIAL_8250_MANY_PORTS is not set
+# CONFIG_SERIAL_8250_RSA is not set
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_OF_PLATFORM=y
+# CONFIG_SERIAL_QE is not set
+# CONFIG_SWIOTLB is not set
 CONFIG_TASK_SIZE=0xc0000000
+# CONFIG_TAU is not set
+# CONFIG_TREE_PREEMPT_RCU is not set
 CONFIG_TREE_RCU=y
+# CONFIG_UCC_GETH is not set
 CONFIG_VITESSE_PHY=y
 CONFIG_VITESSE_PHY_8601_SKEW=y
 CONFIG_WORD_SIZE=32
+# CONFIG_XILINX_EMACLITE is not set
+# CONFIG_YAFFS_9BYTE_TAGS is not set
+# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
 CONFIG_YAFFS_AUTO_YAFFS2=y
+# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
+# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
+# CONFIG_YAFFS_DOES_ECC is not set
 CONFIG_YAFFS_FS=y
 CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
 CONFIG_YAFFS_YAFFS1=y