update config to 2.6.39-rc6

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

2 files changed, 28 insertions, 28 deletions

diff --git a/debian/config/sh4/config.sh7751r b/debian/config/sh4/config.sh7751r
index ad9fa9b5c77c..e4d0015bd89b 100644
--- a/debian/config/sh4/config.sh7751r
+++ b/debian/config/sh4/config.sh7751r
@@ -49,14 +49,6 @@ CONFIG_ATA_SFF=y
 CONFIG_PATA_PLATFORM=y
 
 ##
-## file: drivers/char/Kconfig
-##
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-
-##
 ## file: drivers/hid/Kconfig
 ##
 CONFIG_HID_SUPPORT=y
@@ -86,7 +78,6 @@ CONFIG_MFD_SM501=y
 ## file: drivers/mtd/Kconfig
 ##
 CONFIG_MTD=y
-CONFIG_MTD_CONCAT=y
 CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLKDEVS=y
@@ -137,13 +128,6 @@ CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 
 ##
-## file: drivers/serial/Kconfig
-##
-CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=6
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
-
-##
 ## file: drivers/spi/Kconfig
 ##
 CONFIG_SPI=y
@@ -151,6 +135,21 @@ CONFIG_SPI_BITBANG=y
 CONFIG_SPI_SH_SCI=y
 
 ##
+## file: drivers/tty/Kconfig
+##
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+
+##
+## file: drivers/tty/serial/Kconfig
+##
+CONFIG_SERIAL_SH_SCI=y
+CONFIG_SERIAL_SH_SCI_NR_UARTS=6
+CONFIG_SERIAL_SH_SCI_CONSOLE=y
+
+##
 ## file: drivers/usb/Kconfig
 ##
 CONFIG_USB_SUPPORT=y
@@ -210,5 +209,6 @@ CONFIG_FLATMEM_MANUAL=y
 ##
 CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_MTD_CONCAT=y
 CONFIG_SH_PCIDMA_NONCOHERENT=y
 
diff --git a/debian/config/sh4/config.sh7785lcr b/debian/config/sh4/config.sh7785lcr
index 1531646066cc..68f60a942aab 100644
--- a/debian/config/sh4/config.sh7785lcr
+++ b/debian/config/sh4/config.sh7785lcr
@@ -47,16 +47,6 @@ CONFIG_ATA_SFF=y
 CONFIG_SATA_SIL=y
 
 ##
-## file: drivers/char/Kconfig
-##
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-
-##
 ## file: drivers/dma/Kconfig
 ##
 CONFIG_DMADEVICES=y
@@ -132,7 +122,6 @@ CONFIG_MFD_SM501=y
 ## file: drivers/mtd/Kconfig
 ##
 CONFIG_MTD=y
-CONFIG_MTD_CONCAT=y
 CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLKDEVS=y
@@ -182,7 +171,17 @@ CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 
 ##
-## file: drivers/serial/Kconfig
+## file: drivers/tty/Kconfig
+##
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+
+##
+## file: drivers/tty/serial/Kconfig
 ##
 CONFIG_SERIAL_SH_SCI=y
 CONFIG_SERIAL_SH_SCI_NR_UARTS=6
@@ -263,6 +262,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 ##
 CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_MTD_CONCAT=y
 CONFIG_PMB_ENABLE=y
 CONFIG_PMB_FIXED=y
 CONFIG_SH_PCIDMA_NONCOHERENT=y