From 42793f8a1831b3ad0be5e3d6e67ce28f1863b659 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Mon, 9 May 2011 12:25:32 +0000 Subject: update config to 2.6.39-rc6 svn path=/dists/trunk/linux-2.6/; revision=17327 --- debian/config/sh4/config.sh7751r | 32 ++++++++++++++++---------------- debian/config/sh4/config.sh7785lcr | 24 ++++++++++++------------ 2 files changed, 28 insertions(+), 28 deletions(-) (limited to 'debian/config/sh4') 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 @@ -48,14 +48,6 @@ CONFIG_SATA_PMP=y 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 ## @@ -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 @@ -136,13 +127,6 @@ CONFIG_RTC_DRV_R9701=y 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 ## @@ -150,6 +134,21 @@ CONFIG_SPI=y 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 ## @@ -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 @@ -46,16 +46,6 @@ CONFIG_SATA_PMP=y 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 ## @@ -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 -- cgit v1.2.3