From 4f7ca7019ca60ffd5b04e8ff8087595201aa90a7 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Fri, 23 Oct 2009 16:26:40 +0000 Subject: [PATCH] debian/config: Reorder. svn path=/dists/trunk/linux-2.6/; revision=14435 --- debian/config/alpha/config | 10 +- debian/config/amd64/config | 10 +- debian/config/armel/config | 20 ++-- debian/config/armel/config.iop32x | 10 +- debian/config/armel/config.ixp4xx | 16 +-- debian/config/armel/config.kirkwood | 28 +++-- debian/config/armel/config.orion5x | 33 +++--- debian/config/armel/config.versatile | 8 +- debian/config/config | 117 ++++++++++---------- debian/config/hppa/config | 20 ++-- debian/config/i386/config | 10 +- debian/config/ia64/config | 5 +- debian/config/kernelarch-x86/config | 30 ++--- debian/config/kernelarch-x86/config-arch-32 | 1 + debian/config/kernelarch-x86/config-arch-64 | 1 + debian/config/m68k/config | 2 +- debian/config/m68k/config.amiga | 2 +- debian/config/m68k/config.atari | 2 +- debian/config/mips/config.4kc-malta | 10 +- debian/config/mips/config.5kc-malta | 10 +- debian/config/mips/config.r4k-ip22 | 6 +- debian/config/mips/config.r5k-ip32 | 6 +- debian/config/mips/config.sb1-bcm91250a | 10 +- debian/config/mips/config.sb1a-bcm91480b | 10 +- debian/config/mipsel/config.4kc-malta | 10 +- debian/config/mipsel/config.5kc-malta | 10 +- debian/config/mipsel/config.r5k-cobalt | 4 +- debian/config/mipsel/config.sb1-bcm91250a | 10 +- debian/config/mipsel/config.sb1a-bcm91480b | 10 +- debian/config/powerpc/config | 12 +- debian/config/powerpc/config.powerpc | 1 - debian/config/s390/config | 2 +- debian/config/sparc/config | 4 +- 33 files changed, 240 insertions(+), 200 deletions(-) diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 6d8d9973b..7d79d254f 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -341,10 +341,10 @@ CONFIG_INPUT_JOYSTICK=y ## CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -CONFIG_KEYBOARD_SUNKBD=m CONFIG_KEYBOARD_LKKBD=m -CONFIG_KEYBOARD_XTKBD=m CONFIG_KEYBOARD_NEWTON=m +CONFIG_KEYBOARD_SUNKBD=m +CONFIG_KEYBOARD_XTKBD=m ## ## file: drivers/input/misc/Kconfig @@ -1108,7 +1108,6 @@ CONFIG_MIXCOMWD=m CONFIG_WDT=m CONFIG_PCIPCWATCHDOG=m CONFIG_WDTPCI=m -CONFIG_WDT_501_PCI=y CONFIG_USBPCWATCHDOG=m ## @@ -1335,3 +1334,8 @@ CONFIG_SND_HDA_INTEL=m ## CONFIG_SND_USB_USX2Y=m +## +## file: unknown +## +CONFIG_WDT_501_PCI=y + diff --git a/debian/config/amd64/config b/debian/config/amd64/config index 65d322813..82b90f280 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -333,10 +333,10 @@ CONFIG_INPUT_JOYSTICK=y ## CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -CONFIG_KEYBOARD_SUNKBD=m CONFIG_KEYBOARD_LKKBD=m -CONFIG_KEYBOARD_XTKBD=m CONFIG_KEYBOARD_NEWTON=m +CONFIG_KEYBOARD_SUNKBD=m +CONFIG_KEYBOARD_XTKBD=m ## ## file: drivers/input/misc/Kconfig @@ -1092,7 +1092,6 @@ CONFIG_W83977F_WDT=m CONFIG_MACHZ_WDT=m CONFIG_PCIPCWATCHDOG=m CONFIG_WDTPCI=m -CONFIG_WDT_501_PCI=y CONFIG_USBPCWATCHDOG=m ## @@ -1284,3 +1283,8 @@ CONFIG_SND_HDA_INTEL=m ## CONFIG_SND_USB_USX2Y=m +## +## file: unknown +## +CONFIG_WDT_501_PCI=y + diff --git a/debian/config/armel/config b/debian/config/armel/config index 01dc9c3d7..5d313fe83 100644 --- a/debian/config/armel/config +++ b/debian/config/armel/config @@ -12,6 +12,16 @@ CONFIG_OABI_COMPAT=y ## # CONFIG_IEEE1394 is not set +## +## file: drivers/net/hamradio/Kconfig +## +CONFIG_BPQETHER=m +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_BAYCOM_EPP=m +CONFIG_YAM=m + ## ## file: drivers/net/wireless/ipw2x00/Kconfig ## @@ -62,13 +72,3 @@ CONFIG_OABI_COMPAT=y CONFIG_ECONET_AUNUDP=y CONFIG_ECONET_NATIVE=y -## -## file: drivers/net/hamradio/Kconfig -## -CONFIG_BPQETHER=m -CONFIG_BAYCOM_SER_FDX=m -CONFIG_BAYCOM_SER_HDX=m -CONFIG_BAYCOM_PAR=m -CONFIG_BAYCOM_EPP=m -CONFIG_YAM=m - diff --git a/debian/config/armel/config.iop32x b/debian/config/armel/config.iop32x index 1702cb0e8..b444cf83e 100644 --- a/debian/config/armel/config.iop32x +++ b/debian/config/armel/config.iop32x @@ -13,7 +13,6 @@ # CONFIG_ARCH_FOOTBRIDGE is not set # CONFIG_ARCH_NETX is not set # CONFIG_ARCH_H720X is not set -# CONFIG_ARCH_IMX is not set CONFIG_ARCH_IOP32X=y # CONFIG_ARCH_IOP33X is not set # CONFIG_ARCH_IXP23XX is not set @@ -222,7 +221,6 @@ CONFIG_I2C_IOP3XX=y ## # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCA9539 is not set -# CONFIG_SENSORS_MAX6875 is not set ## ## file: drivers/ide/Kconfig @@ -273,10 +271,10 @@ CONFIG_INPUT_JOYSTICK=y ## CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=m -# CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set ## ## file: drivers/input/misc/Kconfig @@ -712,8 +710,6 @@ CONFIG_LOG_BUF_SHIFT=14 ## file: kernel/trace/Kconfig ## #. disabled because of size restrictions -# CONFIG_CONTEXT_SWITCH_TRACER is not set -#. disabled because of size restrictions # CONFIG_BOOT_TRACER is not set #. disabled because of size restrictions # CONFIG_BLK_DEV_IO_TRACE is not set @@ -891,5 +887,7 @@ CONFIG_SND_RIPTIDE=m ## # CONFIG_ARCH_CLPS7500 is not set # CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_IMX is not set # CONFIG_NO_IDLE_HZ is not set +# CONFIG_SENSORS_MAX6875 is not set diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx index fc6968e9a..1752c4378 100644 --- a/debian/config/armel/config.ixp4xx +++ b/debian/config/armel/config.ixp4xx @@ -13,7 +13,6 @@ # CONFIG_ARCH_FOOTBRIDGE is not set # CONFIG_ARCH_NETX is not set # CONFIG_ARCH_H720X is not set -# CONFIG_ARCH_IMX is not set # CONFIG_ARCH_IOP32X is not set # CONFIG_ARCH_IOP33X is not set # CONFIG_ARCH_IXP23XX is not set @@ -267,7 +266,6 @@ CONFIG_I2C_GPIO=y ## CONFIG_SENSORS_PCF8574=m CONFIG_SENSORS_PCA9539=m -CONFIG_SENSORS_MAX6875=m ## ## file: drivers/ide/Kconfig @@ -289,10 +287,10 @@ CONFIG_INPUT_JOYSTICK=y ## CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=m -# CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set ## ## file: drivers/input/misc/Kconfig @@ -613,7 +611,6 @@ CONFIG_SCSI_SAS_ATTRS=m # CONFIG_SCSI_INIA100 is not set # CONFIG_SCSI_PPA is not set # CONFIG_SCSI_IMM is not set -# CONFIG_SCSI_MVSAS is not set # CONFIG_SCSI_STEX is not set # CONFIG_SCSI_SYM53C8XX_2 is not set # CONFIG_SCSI_QLOGIC_1280 is not set @@ -646,6 +643,11 @@ CONFIG_SCSI_SAS_ATTRS=m # CONFIG_MEGARAID_LEGACY is not set # CONFIG_MEGARAID_SAS is not set +## +## file: drivers/scsi/mvsas/Kconfig +## +# CONFIG_SCSI_MVSAS is not set + ## ## file: drivers/scsi/qla2xxx/Kconfig ## @@ -787,8 +789,6 @@ CONFIG_LOG_BUF_SHIFT=14 ## file: kernel/trace/Kconfig ## #. disabled because of size restrictions -# CONFIG_CONTEXT_SWITCH_TRACER is not set -#. disabled because of size restrictions # CONFIG_BOOT_TRACER is not set #. disabled because of size restrictions # CONFIG_BLK_DEV_IO_TRACE is not set @@ -957,5 +957,7 @@ CONFIG_SND_PCXHR=m ## # CONFIG_ARCH_CLPS7500 is not set # CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_IMX is not set # CONFIG_NO_IDLE_HZ is not set +CONFIG_SENSORS_MAX6875=m diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index 2a79ba9bc..20151f111 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -11,9 +11,9 @@ # CONFIG_ARCH_EBSA110 is not set # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_MXC is not set # CONFIG_ARCH_NETX is not set # CONFIG_ARCH_H720X is not set -# CONFIG_ARCH_IMX is not set # CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IOP32X is not set # CONFIG_ARCH_IOP33X is not set @@ -22,10 +22,9 @@ # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_L7200 is not set CONFIG_ARCH_KIRKWOOD=y +# CONFIG_ARCH_ORION5X is not set # CONFIG_ARCH_KS8695 is not set # CONFIG_ARCH_NS9XXX is not set -# CONFIG_ARCH_MXC is not set -# CONFIG_ARCH_ORION5X is not set # CONFIG_ARCH_PNX4008 is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_RPC is not set @@ -61,7 +60,6 @@ CONFIG_MACH_RD88F6281=y CONFIG_MACH_SHEEVAPLUG=y CONFIG_MACH_TS219=y CONFIG_MACH_OPENRD_BASE=y -CONFIG_MACH_OPENRD_CLIENT=y ## ## file: arch/arm/mm/Kconfig @@ -154,6 +152,11 @@ CONFIG_DMADEVICES=y CONFIG_MV_XOR=y # CONFIG_NET_DMA is not set +## +## file: drivers/gpio/Kconfig +## +CONFIG_GPIO_SYSFS=y + ## ## file: drivers/gpu/drm/Kconfig ## @@ -355,6 +358,7 @@ CONFIG_MV643XX_ETH=m ## ## file: drivers/net/phy/Kconfig ## +# CONFIG_MARVELL_PHY is not set # CONFIG_FIXED_PHY is not set ## @@ -398,7 +402,6 @@ CONFIG_RTC_DRV_MV=y # CONFIG_SCSI_INIA100 is not set # CONFIG_SCSI_PPA is not set # CONFIG_SCSI_IMM is not set -# CONFIG_SCSI_MVSAS is not set # CONFIG_SCSI_STEX is not set # CONFIG_SCSI_SYM53C8XX_2 is not set # CONFIG_SCSI_IPR is not set @@ -431,6 +434,11 @@ CONFIG_RTC_DRV_MV=y # CONFIG_MEGARAID_LEGACY is not set # CONFIG_MEGARAID_SAS is not set +## +## file: drivers/scsi/mvsas/Kconfig +## +# CONFIG_SCSI_MVSAS is not set + ## ## file: drivers/scsi/qla2xxx/Kconfig ## @@ -522,7 +530,6 @@ CONFIG_FB=m ## file: drivers/watchdog/Kconfig ## CONFIG_WATCHDOG=y -CONFIG_ORION5X_WATCHDOG=m ## ## file: fs/Kconfig.binfmt @@ -609,7 +616,10 @@ CONFIG_WAN_ROUTER=m ## CONFIG_X25=m -CONFIG_GPIO_SYSFS=y - -# CONFIG_MARVELL_PHY is not set +## +## file: unknown +## +# CONFIG_ARCH_IMX is not set +CONFIG_MACH_OPENRD_CLIENT=y +CONFIG_ORION5X_WATCHDOG=m diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x index d90ff6852..8dabcf911 100644 --- a/debian/config/armel/config.orion5x +++ b/debian/config/armel/config.orion5x @@ -11,9 +11,9 @@ # CONFIG_ARCH_EBSA110 is not set # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_MXC is not set # CONFIG_ARCH_NETX is not set # CONFIG_ARCH_H720X is not set -# CONFIG_ARCH_IMX is not set # CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IOP32X is not set # CONFIG_ARCH_IOP33X is not set @@ -21,10 +21,9 @@ # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_L7200 is not set +CONFIG_ARCH_ORION5X=y # CONFIG_ARCH_KS8695 is not set # CONFIG_ARCH_NS9XXX is not set -# CONFIG_ARCH_MXC is not set -CONFIG_ARCH_ORION5X=y # CONFIG_ARCH_PNX4008 is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_RPC is not set @@ -143,6 +142,11 @@ CONFIG_BT_HCIBPA10X=m CONFIG_BT_HCIBFUSB=m CONFIG_BT_HCIVHCI=m +## +## file: drivers/crypto/Kconfig +## +CONFIG_CRYPTO_DEV_MV_CESA=m + ## ## file: drivers/dma/Kconfig ## @@ -150,6 +154,11 @@ CONFIG_DMADEVICES=y CONFIG_MV_XOR=y # CONFIG_NET_DMA is not set +## +## file: drivers/gpio/Kconfig +## +CONFIG_GPIO_SYSFS=y + ## ## file: drivers/gpu/drm/Kconfig ## @@ -336,6 +345,7 @@ CONFIG_MV643XX_ETH=m ## ## file: drivers/net/phy/Kconfig ## +# CONFIG_MARVELL_PHY is not set # CONFIG_FIXED_PHY is not set ## @@ -382,7 +392,6 @@ CONFIG_RTC_DRV_S35390A=y # CONFIG_SCSI_INIA100 is not set # CONFIG_SCSI_PPA is not set # CONFIG_SCSI_IMM is not set -# CONFIG_SCSI_MVSAS is not set # CONFIG_SCSI_STEX is not set # CONFIG_SCSI_SYM53C8XX_2 is not set # CONFIG_SCSI_IPR is not set @@ -415,6 +424,11 @@ CONFIG_RTC_DRV_S35390A=y # CONFIG_MEGARAID_LEGACY is not set # CONFIG_MEGARAID_SAS is not set +## +## file: drivers/scsi/mvsas/Kconfig +## +# CONFIG_SCSI_MVSAS is not set + ## ## file: drivers/scsi/qla2xxx/Kconfig ## @@ -501,7 +515,6 @@ CONFIG_FB=m ## file: drivers/watchdog/Kconfig ## CONFIG_WATCHDOG=y -CONFIG_ORION5X_WATCHDOG=m ## ## file: fs/Kconfig.binfmt @@ -549,8 +562,6 @@ CONFIG_HIGH_RES_TIMERS=y ## file: kernel/trace/Kconfig ## #. disabled because of size restrictions -# CONFIG_CONTEXT_SWITCH_TRACER is not set -#. disabled because of size restrictions # CONFIG_BOOT_TRACER is not set #. disabled because of size restrictions # CONFIG_BLK_DEV_IO_TRACE is not set @@ -599,11 +610,7 @@ CONFIG_X25=m ## # CONFIG_ARCH_CLPS7500 is not set # CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_IMX is not set # CONFIG_ARCH_MSM7X00A is not set - -CONFIG_GPIO_SYSFS=y - -# CONFIG_MARVELL_PHY is not set - -CONFIG_CRYPTO_DEV_MV_CESA=m +CONFIG_ORION5X_WATCHDOG=m diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile index 0359fe676..c09c4fdfd 100644 --- a/debian/config/armel/config.versatile +++ b/debian/config/armel/config.versatile @@ -11,9 +11,9 @@ CONFIG_ARCH_VERSATILE=y # CONFIG_ARCH_EBSA110 is not set # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_MXC is not set # CONFIG_ARCH_NETX is not set # CONFIG_ARCH_H720X is not set -# CONFIG_ARCH_IMX is not set # CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IOP32X is not set # CONFIG_ARCH_IOP33X is not set @@ -23,7 +23,6 @@ CONFIG_ARCH_VERSATILE=y # CONFIG_ARCH_L7200 is not set # CONFIG_ARCH_KS8695 is not set # CONFIG_ARCH_NS9XXX is not set -# CONFIG_ARCH_MXC is not set # CONFIG_ARCH_PNX4008 is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_RPC is not set @@ -164,11 +163,11 @@ CONFIG_VT_CONSOLE=y ## CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set CONFIG_KEYBOARD_STOWAWAY=m +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set ## ## file: drivers/input/misc/Kconfig @@ -512,4 +511,5 @@ CONFIG_IPX_INTERN=y ## # CONFIG_ARCH_CLPS7500 is not set # CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_IMX is not set diff --git a/debian/config/config b/debian/config/config index e54578a41..e1195fc11 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2,7 +2,6 @@ ## file: block/Kconfig ## CONFIG_BLOCK=y -CONFIG_LBD=y CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_INTEGRITY=y @@ -388,12 +387,6 @@ CONFIG_SENSORS_LIS3LV02D=m CONFIG_SENSORS_APPLESMC=m # CONFIG_HWMON_DEBUG_CHIP is not set -## -## file: drivers/i2c/Kconfig -## -CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKEHARD=m - ## ## file: drivers/i2c/Kconfig ## @@ -416,7 +409,6 @@ CONFIG_I2C_PCA_PLATFORM=m CONFIG_DS1682=m CONFIG_PCF8575=m CONFIG_SENSORS_PCA9539=m -CONFIG_SENSORS_MAX6875=m CONFIG_SENSORS_TSL2550=m ## @@ -445,6 +437,12 @@ CONFIG_I7300_IDLE=m ## # CONFIG_IEEE1394 is not set +## +## file: drivers/ieee802154/Kconfig +## +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m + ## ## file: drivers/infiniband/Kconfig ## @@ -575,9 +573,9 @@ CONFIG_INPUT_PCF50633_PMU=m ## file: drivers/input/mouse/Kconfig ## CONFIG_MOUSE_PS2_ALPS=y -CONFIG_MOUSE_SYNAPTICS_I2C=m # CONFIG_MOUSE_PS2_ELANTECH is not set # CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_SYNAPTICS_I2C=m ## ## file: drivers/input/touchscreen/Kconfig @@ -628,7 +626,6 @@ CONFIG_GIGASET_BASE=m CONFIG_GIGASET_M105=m CONFIG_GIGASET_M101=m # CONFIG_GIGASET_DEBUG is not set -# CONFIG_GIGASET_UNDOCREQ is not set ## ## file: drivers/isdn/hardware/mISDN/Kconfig @@ -659,7 +656,6 @@ CONFIG_LEDS_NET48XX=m CONFIG_LEDS_ALIX2=m CONFIG_LEDS_PCA9532=m CONFIG_LEDS_LP3944=m -CONFIG_LEDS_LP5521=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_WM8350=m CONFIG_LEDS_DAC124S085=m @@ -827,12 +823,6 @@ CONFIG_DVB_DUMMY_FE=m ## CONFIG_DVB_PLUTO2=m -## -## file: drivers/media/dvb/siano/Kconfig -## -CONFIG_DVB_SIANO_SMS1XXX=m -CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS=y - ## ## file: drivers/media/dvb/ttpci/Kconfig ## @@ -1171,8 +1161,6 @@ CONFIG_SGI_XP=m CONFIG_SGI_GRU=m # CONFIG_SGI_GRU_DEBUG is not set CONFIG_ISL29003=m -CONFIG_CB710_CORE=m -# CONFIG_CB710_DEBUG is not set ## ## file: drivers/misc/c2port/Kconfig @@ -1180,6 +1168,12 @@ CONFIG_CB710_CORE=m CONFIG_C2PORT=m CONFIG_C2PORT_DURAMAR_2150=m +## +## file: drivers/misc/cb710/Kconfig +## +CONFIG_CB710_CORE=m +# CONFIG_CB710_DEBUG is not set + ## ## file: drivers/misc/eeprom/Kconfig ## @@ -1283,7 +1277,6 @@ CONFIG_MTD_UBI_BEB_RESERVE=1 ## file: drivers/net/Kconfig ## CONFIG_NETDEVICES=y -CONFIG_COMPAT_NET_DEV_OPS=y CONFIG_IFB=m CONFIG_BONDING=m CONFIG_MACVLAN=m @@ -1559,18 +1552,18 @@ CONFIG_MAC80211_HWSIM=m CONFIG_MWL8K=m ## -## file: drivers/net/wireless/ar9170/Kconfig +## file: drivers/net/wireless/ath/ar9170/Kconfig ## CONFIG_AR9170_USB=m ## -## file: drivers/net/wireless/ath5k/Kconfig +## file: drivers/net/wireless/ath/ath5k/Kconfig ## CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set ## -## file: drivers/net/wireless/ath9k/Kconfig +## file: drivers/net/wireless/ath/ath9k/Kconfig ## CONFIG_ATH9K=m # CONFIG_ATH9K_DEBUG is not set @@ -1619,7 +1612,6 @@ CONFIG_IPW2200_QOS=y ## CONFIG_IWLWIFI=m CONFIG_IWLWIFI_LEDS=y -CONFIG_IWLWIFI_RFKILL=y CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m @@ -1858,8 +1850,6 @@ CONFIG_SCSI_PPA=m CONFIG_SCSI_IMM=m # CONFIG_SCSI_IZIP_EPP16 is not set # CONFIG_SCSI_IZIP_SLOW_CTR is not set -CONFIG_SCSI_MVSAS=m -# CONFIG_SCSI_MVSAS_DEBUG is not set CONFIG_SCSI_STEX=m CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_IPR is not set @@ -1932,6 +1922,12 @@ CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 # CONFIG_SCSI_MPT2SAS_LOGGING is not set +## +## file: drivers/scsi/mvsas/Kconfig +## +CONFIG_SCSI_MVSAS=m +# CONFIG_SCSI_MVSAS_DEBUG is not set + ## ## file: drivers/scsi/osd/Kconfig ## @@ -2157,6 +2153,7 @@ CONFIG_STAGING=y ## ## file: drivers/staging/speakup/Kconfig ## +CONFIG_SPEAKUP=m CONFIG_SPEAKUP_SYNTH_ACNTSA=m CONFIG_SPEAKUP_SYNTH_ACNTPC=m CONFIG_SPEAKUP_SYNTH_APOLLO=m @@ -2171,7 +2168,6 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m CONFIG_SPEAKUP_SYNTH_DUMMY=m -CONFIG_SPEAKUP=m ## ## file: drivers/staging/stlc45xx/Kconfig @@ -2466,12 +2462,11 @@ CONFIG_SBC_EPX_C3_WATCHDOG=m ## ## file: fs/Kconfig ## +CONFIG_CUSE=m CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y -CONFIG_CUSE=m CONFIG_HUGETLBFS=y CONFIG_MISC_FILESYSTEMS=y -CONFIG_NILFS2_FS=m CONFIG_NETWORK_FILESYSTEMS=y ## @@ -2497,6 +2492,20 @@ CONFIG_AFS_FS=m # CONFIG_AFS_DEBUG is not set CONFIG_AFS_FSCACHE=y +## +## file: fs/aufs/Kconfig +## +CONFIG_AUFS_FS=m +## choice: Maximum number of branches +CONFIG_AUFS_BRANCH_MAX_127=y +## end choice +# CONFIG_AUFS_HINOTIFY is not set +# CONFIG_AUFS_EXPORT is not set +# CONFIG_AUFS_SHWH is not set +# CONFIG_AUFS_BR_RAMFS is not set +# CONFIG_AUFS_BR_FUSE is not set +# CONFIG_AUFS_DEBUG is not set + ## ## file: fs/autofs/Kconfig ## @@ -2747,6 +2756,11 @@ CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y +## +## file: fs/nilfs2/Kconfig +## +CONFIG_NILFS2_FS=m + ## ## file: fs/nls/Kconfig ## @@ -2791,11 +2805,6 @@ CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m CONFIG_NLS_UTF8=m -## -## file: fs/notify/Kconfig -## -CONFIG_FSNOTIFY=y - ## ## file: fs/notify/dnotify/Kconfig ## @@ -2985,7 +2994,6 @@ CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_EXTRA_PASS is not set -CONFIG_STRIP_ASM_SYMS=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y @@ -2996,6 +3004,7 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_VM_EVENT_COUNTERS=y +CONFIG_STRIP_ASM_SYMS=y # CONFIG_COMPAT_BRK is not set ## choice: Choose SLAB allocator CONFIG_SLAB=y @@ -3011,6 +3020,11 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set +## +## file: kernel/gcov/Kconfig +## +# CONFIG_GCOV_KERNEL is not set + ## ## file: kernel/Kconfig.hz ## @@ -3021,11 +3035,6 @@ CONFIG_HZ_250=y # CONFIG_HZ_1000 is not set ## end choice -## -## file: kernel/gcov/Kconfig -## -# CONFIG_GCOV_KERNEL is not set - ## ## file: kernel/power/Kconfig ## @@ -3057,11 +3066,8 @@ CONFIG_HIGH_RES_TIMERS=y # CONFIG_IRQSOFF_TRACER is not set # CONFIG_SYSPROF_TRACER is not set # CONFIG_SCHED_TRACER is not set -# CONFIG_CONTEXT_SWITCH_TRACER is not set -# CONFIG_EVENT_TRACER is not set # CONFIG_FTRACE_SYSCALLS is not set CONFIG_BOOT_TRACER=y -# CONFIG_TRACE_BRANCH_PROFILING is not set # CONFIG_POWER_TRACER is not set # CONFIG_STACK_TRACER is not set # CONFIG_HW_BRANCH_TRACER is not set @@ -3140,7 +3146,6 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y ## ## file: mm/Kconfig ## -CONFIG_UNEVICTABLE_LRU=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 ## @@ -3686,7 +3691,6 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_FILE_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set CONFIG_LSM_MMAP_MIN_ADDR=32768 -CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=4096 ## ## file: security/integrity/ima/Kconfig @@ -3824,18 +3828,6 @@ CONFIG_SND_USB_CAIAQ=m CONFIG_SND_USB_CAIAQ_INPUT=y CONFIG_SND_USB_US122L=m -## -## file: ubuntu/aufs/Kconfig -## -CONFIG_AUFS_FS=m -CONFIG_AUFS_BRANCH_MAX_127=y -# CONFIG_AUFS_HINOTIFY is not set -# CONFIG_AUFS_EXPORT is not set -# CONFIG_AUFS_SHWH is not set -# CONFIG_AUFS_BR_RAMFS is not set -# CONFIG_AUFS_BR_FUSE is not set -# CONFIG_AUFS_DEBUG is not set - ## ## file: usr/Kconfig ## @@ -3844,7 +3836,18 @@ CONFIG_INITRAMFS_SOURCE="" ## ## file: unknown ## +CONFIG_COMPAT_NET_DEV_OPS=y +CONFIG_DVB_SIANO_SMS1XXX=m +CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS=y # CONFIG_DYNAMIC_PRINTK_DEBUG is not set +# CONFIG_EVENT_TRACER is not set +# CONFIG_GIGASET_UNDOCREQ is not set +CONFIG_IWLWIFI_RFKILL=y # CONFIG_KPROBES is not set +CONFIG_LBD=y +CONFIG_LEDS_LP5521=m CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_SENSORS_MAX6875=m +CONFIG_UNEVICTABLE_LRU=y diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 15f55c2f9..a5620d0c6 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -147,12 +147,12 @@ CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y CONFIG_KEYBOARD_ATKBD_HP_KEYCODES=y # CONFIG_KEYBOARD_ATKBD_RDI_KEYCODES is not set -# CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set -# CONFIG_KEYBOARD_NEWTON is not set CONFIG_KEYBOARD_HIL_OLD=m CONFIG_KEYBOARD_HIL=m +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set ## ## file: drivers/input/misc/Kconfig @@ -210,16 +210,16 @@ CONFIG_I2O_BLOCK=m CONFIG_I2O_SCSI=m CONFIG_I2O_PROC=m -## -## file: drivers/mmc/Kconfig -## -# CONFIG_MMC is not set - ## ## file: drivers/mfd/Kconfig ## # CONFIG_AB3100_CORE is not set +## +## file: drivers/mmc/Kconfig +## +# CONFIG_MMC is not set + ## ## file: drivers/mtd/Kconfig ## @@ -294,13 +294,13 @@ CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_VIA_RHINE=m # CONFIG_VIA_RHINE_MMIO is not set +# CONFIG_VXGE is not set +# CONFIG_NIU is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set CONFIG_PLIP=m # CONFIG_NET_FC is not set # CONFIG_NETPOLL_TRAP is not set -# CONFIG_VXGE is not set -# CONFIG_NIU is not set ## ## file: drivers/net/appletalk/Kconfig diff --git a/debian/config/i386/config b/debian/config/i386/config index 4d0198699..28deca22a 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -365,10 +365,10 @@ CONFIG_INPUT_JOYSTICK=y ## CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -CONFIG_KEYBOARD_SUNKBD=m CONFIG_KEYBOARD_LKKBD=m -CONFIG_KEYBOARD_XTKBD=m CONFIG_KEYBOARD_NEWTON=m +CONFIG_KEYBOARD_SUNKBD=m +CONFIG_KEYBOARD_XTKBD=m ## ## file: drivers/input/misc/Kconfig @@ -1282,7 +1282,6 @@ CONFIG_MIXCOMWD=m CONFIG_WDT=m CONFIG_PCIPCWATCHDOG=m CONFIG_WDTPCI=m -CONFIG_WDT_501_PCI=y CONFIG_USBPCWATCHDOG=m ## @@ -1516,3 +1515,8 @@ CONFIG_SND_HDA_INTEL=m ## CONFIG_SND_USB_USX2Y=m +## +## file: unknown +## +CONFIG_WDT_501_PCI=y + diff --git a/debian/config/ia64/config b/debian/config/ia64/config index fe89bd214..d11ed0860 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -15,7 +15,6 @@ CONFIG_IA64_MCA_RECOVERY=m CONFIG_PERFMON=y CONFIG_IA64_PALINFO=m CONFIG_KEXEC=y -CONFIG_HOTPLUG_CPU=y CONFIG_CRASH_DUMP=y ## @@ -290,10 +289,10 @@ CONFIG_INPUT_JOYSTICK=y ## CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -CONFIG_KEYBOARD_SUNKBD=m CONFIG_KEYBOARD_LKKBD=m -CONFIG_KEYBOARD_XTKBD=m CONFIG_KEYBOARD_NEWTON=m +CONFIG_KEYBOARD_SUNKBD=m +CONFIG_KEYBOARD_XTKBD=m ## ## file: drivers/input/misc/Kconfig diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 4a96a3463..d3c737cd8 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -8,7 +8,6 @@ CONFIG_OPROFILE_IBS=y ## file: arch/x86/Kconfig ## CONFIG_SPARSE_IRQ=y -CONFIG_NUMA_MIGRATE_IRQ_DESC=y CONFIG_X86_MPPARSE=y # CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_SCHED_OMIT_FRAME_POINTER=y @@ -53,7 +52,6 @@ CONFIG_HOTPLUG_CPU=y CONFIG_PCI=y CONFIG_DMAR=y # CONFIG_DMAR_DEFAULT_ON is not set -CONFIG_DMAR_GFX_WA=y CONFIG_INTR_REMAP=y CONFIG_IA32_EMULATION=y CONFIG_IA32_AOUT=y @@ -110,15 +108,6 @@ CONFIG_KVM_AMD=m CONFIG_XEN=y # CONFIG_XEN_DEBUG_FS is not set -## -## file: drivers/char/hw_random/Kconfig -## -CONFIG_HW_RANDOM=m -CONFIG_HW_RANDOM_INTEL=m -CONFIG_HW_RANDOM_AMD=m -CONFIG_HW_RANDOM_VIA=m -CONFIG_HW_RANDOM_GEODE=m - ## ## file: drivers/acpi/Kconfig ## @@ -152,6 +141,15 @@ CONFIG_XEN_BLKDEV_FRONTEND=m ## CONFIG_HVC_XEN=y +## +## file: drivers/char/hw_random/Kconfig +## +CONFIG_HW_RANDOM=m +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_GEODE=m +CONFIG_HW_RANDOM_VIA=m + ## ## file: drivers/cpufreq/Kconfig ## @@ -169,8 +167,8 @@ CONFIG_EDAC=y # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_MM_EDAC=m CONFIG_EDAC_AMD64=m -CONFIG_EDAC_AMD76X=m # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set +CONFIG_EDAC_AMD76X=m CONFIG_EDAC_E7XXX=m CONFIG_EDAC_E752X=m CONFIG_EDAC_I82875P=m @@ -203,7 +201,6 @@ CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set # CONFIG_THINKPAD_ACPI_DEBUG is not set # CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set -CONFIG_THINKPAD_ACPI_BAY=y CONFIG_THINKPAD_ACPI_VIDEO=y CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y # CONFIG_INTEL_MENLOW is not set @@ -289,3 +286,10 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 ## CONFIG_IPV6=y +## +## file: unknown +## +CONFIG_DMAR_GFX_WA=y +CONFIG_NUMA_MIGRATE_IRQ_DESC=y +CONFIG_THINKPAD_ACPI_BAY=y + diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32 index 5aa8ee82f..57e8d3fc3 100644 --- a/debian/config/kernelarch-x86/config-arch-32 +++ b/debian/config/kernelarch-x86/config-arch-32 @@ -97,3 +97,4 @@ CONFIG_FLATMEM_MANUAL=y ## file: security/Kconfig ## CONFIG_LSM_MMAP_MIN_ADDR=0 + diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64 index 2f6882d1e..cfae1a084 100644 --- a/debian/config/kernelarch-x86/config-arch-64 +++ b/debian/config/kernelarch-x86/config-arch-64 @@ -71,3 +71,4 @@ CONFIG_MIGRATION=y ## file: security/Kconfig ## CONFIG_LSM_MMAP_MIN_ADDR=65536 + diff --git a/debian/config/m68k/config b/debian/config/m68k/config index 9eafd165d..935c54de6 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -61,8 +61,8 @@ CONFIG_GEN_RTC_X=y ## CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_XTKBD is not set ## ## file: drivers/input/mouse/Kconfig diff --git a/debian/config/m68k/config.amiga b/debian/config/m68k/config.amiga index 39562b900..d511093a1 100644 --- a/debian/config/m68k/config.amiga +++ b/debian/config/m68k/config.amiga @@ -93,9 +93,9 @@ CONFIG_JOYSTICK_AMIGA=m ## ## file: drivers/input/keyboard/Kconfig ## +CONFIG_KEYBOARD_AMIGA=y # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_SUNKBD is not set -CONFIG_KEYBOARD_AMIGA=y ## ## file: drivers/input/misc/Kconfig diff --git a/debian/config/m68k/config.atari b/debian/config/m68k/config.atari index 2b17c92f0..4e4e996c6 100644 --- a/debian/config/m68k/config.atari +++ b/debian/config/m68k/config.atari @@ -61,9 +61,9 @@ CONFIG_BLK_DEV_FALCON_IDE=y ## ## file: drivers/input/keyboard/Kconfig ## +CONFIG_KEYBOARD_ATARI=y CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_SUNKBD is not set -CONFIG_KEYBOARD_ATARI=y ## ## file: drivers/input/misc/Kconfig diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index 8d491922e..648dc755e 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -363,7 +363,6 @@ CONFIG_I2C_VOODOO3=m ## CONFIG_SENSORS_PCF8574=m CONFIG_SENSORS_PCA9539=m -CONFIG_SENSORS_MAX6875=m ## ## file: drivers/ide/Kconfig @@ -420,11 +419,11 @@ CONFIG_INPUT_JOYSTICK=y ## CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -CONFIG_KEYBOARD_SUNKBD=m CONFIG_KEYBOARD_LKKBD=m -CONFIG_KEYBOARD_XTKBD=m CONFIG_KEYBOARD_NEWTON=m CONFIG_KEYBOARD_STOWAWAY=m +CONFIG_KEYBOARD_SUNKBD=m +CONFIG_KEYBOARD_XTKBD=m ## ## file: drivers/input/misc/Kconfig @@ -489,7 +488,6 @@ CONFIG_ISDN_DRV_GIGASET=m CONFIG_GIGASET_BASE=m CONFIG_GIGASET_M105=m # CONFIG_GIGASET_DEBUG is not set -# CONFIG_GIGASET_UNDOCREQ is not set ## ## file: drivers/isdn/hardware/avm/Kconfig @@ -1348,7 +1346,6 @@ CONFIG_WATCHDOG=y CONFIG_SOFT_WATCHDOG=m CONFIG_PCIPCWATCHDOG=m CONFIG_WDTPCI=m -CONFIG_WDT_501_PCI=y CONFIG_USBPCWATCHDOG=m ## @@ -1657,7 +1654,10 @@ CONFIG_SND_HDA_INTEL=m ## ## file: unknown ## +# CONFIG_GIGASET_UNDOCREQ is not set # CONFIG_MARKEINS is not set # CONFIG_MIPS_ATLAS is not set # CONFIG_MIPS_SEAD is not set +CONFIG_SENSORS_MAX6875=m +CONFIG_WDT_501_PCI=y diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 6871272f0..b81db4016 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -360,7 +360,6 @@ CONFIG_I2C_VOODOO3=m ## CONFIG_SENSORS_PCF8574=m CONFIG_SENSORS_PCA9539=m -CONFIG_SENSORS_MAX6875=m ## ## file: drivers/ide/Kconfig @@ -472,11 +471,11 @@ CONFIG_INPUT_JOYSTICK=y ## CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -CONFIG_KEYBOARD_SUNKBD=m CONFIG_KEYBOARD_LKKBD=m -CONFIG_KEYBOARD_XTKBD=m CONFIG_KEYBOARD_NEWTON=m CONFIG_KEYBOARD_STOWAWAY=m +CONFIG_KEYBOARD_SUNKBD=m +CONFIG_KEYBOARD_XTKBD=m ## ## file: drivers/input/misc/Kconfig @@ -547,7 +546,6 @@ CONFIG_GIGASET_BASE=m CONFIG_GIGASET_M105=m CONFIG_GIGASET_M101=m # CONFIG_GIGASET_DEBUG is not set -# CONFIG_GIGASET_UNDOCREQ is not set ## ## file: drivers/isdn/hardware/avm/Kconfig @@ -1648,7 +1646,6 @@ CONFIG_WATCHDOG=y CONFIG_SOFT_WATCHDOG=m CONFIG_PCIPCWATCHDOG=m CONFIG_WDTPCI=m -CONFIG_WDT_501_PCI=y CONFIG_USBPCWATCHDOG=m ## @@ -1958,7 +1955,10 @@ CONFIG_SND_HDA_INTEL=m ## ## file: unknown ## +# CONFIG_GIGASET_UNDOCREQ is not set # CONFIG_MARKEINS is not set # CONFIG_MIPS_ATLAS is not set # CONFIG_MIPS_SEAD is not set +CONFIG_SENSORS_MAX6875=m +CONFIG_WDT_501_PCI=y diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22 index e445e9c82..ede8a3303 100644 --- a/debian/config/mips/config.r4k-ip22 +++ b/debian/config/mips/config.r4k-ip22 @@ -206,7 +206,6 @@ CONFIG_I2C_CHARDEV=m ## # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCA9539 is not set -# CONFIG_SENSORS_MAX6875 is not set ## ## file: drivers/ide/Kconfig @@ -233,10 +232,10 @@ CONFIG_I2C_CHARDEV=m ## CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set ## ## file: drivers/input/misc/Kconfig @@ -626,4 +625,5 @@ CONFIG_SND_SGI_HAL2=m ## # CONFIG_MIPS_ATLAS is not set # CONFIG_MIPS_SEAD is not set +# CONFIG_SENSORS_MAX6875 is not set diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32 index a0135acfb..168447429 100644 --- a/debian/config/mips/config.r5k-ip32 +++ b/debian/config/mips/config.r5k-ip32 @@ -234,7 +234,6 @@ CONFIG_I2C_CHARDEV=m ## # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCA9539 is not set -# CONFIG_SENSORS_MAX6875 is not set ## ## file: drivers/ide/Kconfig @@ -266,10 +265,10 @@ CONFIG_I2C_CHARDEV=m ## CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set ## ## file: drivers/input/misc/Kconfig @@ -784,4 +783,5 @@ CONFIG_SND_KORG1212=m CONFIG_INPUT_SGIO2_BTNS=m # CONFIG_MIPS_ATLAS is not set # CONFIG_MIPS_SEAD is not set +# CONFIG_SENSORS_MAX6875 is not set diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index edde4f6ba..ad050f73f 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -108,10 +108,8 @@ CONFIG_CPU_SB1_PASS_2_2=y # CONFIG_CPU_SB1_PASS_2_112x is not set # CONFIG_CPU_SB1_PASS_3 is not set ## end choice -# CONFIG_SIMULATION is not set # CONFIG_SB1_CEX_ALWAYS_FATAL is not set # CONFIG_SB1_CERR_STALL is not set -CONFIG_SIBYTE_CFE=y # CONFIG_SIBYTE_CFE_CONSOLE is not set # CONFIG_SIBYTE_BUS_WATCHER is not set # CONFIG_SIBYTE_TBPROF is not set @@ -282,7 +280,6 @@ CONFIG_I2C_STUB=m ## # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCA9539 is not set -# CONFIG_SENSORS_MAX6875 is not set ## ## file: drivers/ide/Kconfig @@ -314,10 +311,10 @@ CONFIG_I2C_STUB=m ## CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set ## ## file: drivers/input/misc/Kconfig @@ -1017,4 +1014,7 @@ CONFIG_BLK_DEV_IDE_SWARM=y # CONFIG_LAN_SAA9730 is not set # CONFIG_MIPS_ATLAS is not set # CONFIG_MIPS_SEAD is not set +# CONFIG_SENSORS_MAX6875 is not set +CONFIG_SIBYTE_CFE=y +# CONFIG_SIMULATION is not set diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index a1201287f..f33ce908d 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -108,10 +108,8 @@ CONFIG_CMDLINE="" # CONFIG_CPU_SB1_PASS_2_112x is not set # CONFIG_CPU_SB1_PASS_3 is not set ## end choice -# CONFIG_SIMULATION is not set # CONFIG_SB1_CEX_ALWAYS_FATAL is not set # CONFIG_SB1_CERR_STALL is not set -CONFIG_SIBYTE_CFE=y # CONFIG_SIBYTE_CFE_CONSOLE is not set # CONFIG_SIBYTE_BUS_WATCHER is not set # CONFIG_SIBYTE_TBPROF is not set @@ -283,7 +281,6 @@ CONFIG_I2C_STUB=m ## # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCA9539 is not set -# CONFIG_SENSORS_MAX6875 is not set ## ## file: drivers/ide/Kconfig @@ -344,10 +341,10 @@ CONFIG_BLK_DEV_VIA82CXXX=m ## CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set ## ## file: drivers/input/misc/Kconfig @@ -1046,4 +1043,7 @@ CONFIG_SND_HDA_INTEL=m # CONFIG_LAN_SAA9730 is not set # CONFIG_MIPS_ATLAS is not set # CONFIG_MIPS_SEAD is not set +# CONFIG_SENSORS_MAX6875 is not set +CONFIG_SIBYTE_CFE=y +# CONFIG_SIMULATION is not set diff --git a/debian/config/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta index 0a0fce03b..f5a26542f 100644 --- a/debian/config/mipsel/config.4kc-malta +++ b/debian/config/mipsel/config.4kc-malta @@ -362,7 +362,6 @@ CONFIG_I2C_VOODOO3=m ## CONFIG_SENSORS_PCF8574=m CONFIG_SENSORS_PCA9539=m -CONFIG_SENSORS_MAX6875=m ## ## file: drivers/ide/Kconfig @@ -419,11 +418,11 @@ CONFIG_INPUT_JOYSTICK=y ## CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -CONFIG_KEYBOARD_SUNKBD=m CONFIG_KEYBOARD_LKKBD=m -CONFIG_KEYBOARD_XTKBD=m CONFIG_KEYBOARD_NEWTON=m CONFIG_KEYBOARD_STOWAWAY=m +CONFIG_KEYBOARD_SUNKBD=m +CONFIG_KEYBOARD_XTKBD=m ## ## file: drivers/input/misc/Kconfig @@ -488,7 +487,6 @@ CONFIG_ISDN_DRV_GIGASET=m CONFIG_GIGASET_BASE=m CONFIG_GIGASET_M105=m # CONFIG_GIGASET_DEBUG is not set -# CONFIG_GIGASET_UNDOCREQ is not set ## ## file: drivers/isdn/hardware/avm/Kconfig @@ -1347,7 +1345,6 @@ CONFIG_WATCHDOG=y CONFIG_SOFT_WATCHDOG=m CONFIG_PCIPCWATCHDOG=m CONFIG_WDTPCI=m -CONFIG_WDT_501_PCI=y CONFIG_USBPCWATCHDOG=m ## @@ -1639,7 +1636,10 @@ CONFIG_SND_HDA_INTEL=m ## ## file: unknown ## +# CONFIG_GIGASET_UNDOCREQ is not set # CONFIG_MARKEINS is not set # CONFIG_MIPS_ATLAS is not set # CONFIG_MIPS_SEAD is not set +CONFIG_SENSORS_MAX6875=m +CONFIG_WDT_501_PCI=y diff --git a/debian/config/mipsel/config.5kc-malta b/debian/config/mipsel/config.5kc-malta index 01eaba242..01430485a 100644 --- a/debian/config/mipsel/config.5kc-malta +++ b/debian/config/mipsel/config.5kc-malta @@ -359,7 +359,6 @@ CONFIG_I2C_VOODOO3=m ## CONFIG_SENSORS_PCF8574=m CONFIG_SENSORS_PCA9539=m -CONFIG_SENSORS_MAX6875=m ## ## file: drivers/ide/Kconfig @@ -471,11 +470,11 @@ CONFIG_INPUT_JOYSTICK=y ## CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -CONFIG_KEYBOARD_SUNKBD=m CONFIG_KEYBOARD_LKKBD=m -CONFIG_KEYBOARD_XTKBD=m CONFIG_KEYBOARD_NEWTON=m CONFIG_KEYBOARD_STOWAWAY=m +CONFIG_KEYBOARD_SUNKBD=m +CONFIG_KEYBOARD_XTKBD=m ## ## file: drivers/input/misc/Kconfig @@ -546,7 +545,6 @@ CONFIG_GIGASET_BASE=m CONFIG_GIGASET_M105=m CONFIG_GIGASET_M101=m # CONFIG_GIGASET_DEBUG is not set -# CONFIG_GIGASET_UNDOCREQ is not set ## ## file: drivers/isdn/hardware/avm/Kconfig @@ -1648,7 +1646,6 @@ CONFIG_WATCHDOG=y CONFIG_SOFT_WATCHDOG=m CONFIG_PCIPCWATCHDOG=m CONFIG_WDTPCI=m -CONFIG_WDT_501_PCI=y CONFIG_USBPCWATCHDOG=m ## @@ -1953,7 +1950,10 @@ CONFIG_SND_HDA_INTEL=m ## ## file: unknown ## +# CONFIG_GIGASET_UNDOCREQ is not set # CONFIG_MARKEINS is not set # CONFIG_MIPS_ATLAS is not set # CONFIG_MIPS_SEAD is not set +CONFIG_SENSORS_MAX6875=m +CONFIG_WDT_501_PCI=y diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index 7d9c50294..46ba8290b 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -223,10 +223,10 @@ CONFIG_BLK_DEV_VIA82CXXX=y ## CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=m -# CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set ## ## file: drivers/input/misc/Kconfig diff --git a/debian/config/mipsel/config.sb1-bcm91250a b/debian/config/mipsel/config.sb1-bcm91250a index 6c0e1ef69..75893f7f6 100644 --- a/debian/config/mipsel/config.sb1-bcm91250a +++ b/debian/config/mipsel/config.sb1-bcm91250a @@ -108,10 +108,8 @@ CONFIG_CPU_SB1_PASS_2_2=y # CONFIG_CPU_SB1_PASS_2_112x is not set # CONFIG_CPU_SB1_PASS_3 is not set ## end choice -# CONFIG_SIMULATION is not set # CONFIG_SB1_CEX_ALWAYS_FATAL is not set # CONFIG_SB1_CERR_STALL is not set -CONFIG_SIBYTE_CFE=y # CONFIG_SIBYTE_CFE_CONSOLE is not set # CONFIG_SIBYTE_BUS_WATCHER is not set # CONFIG_SIBYTE_TBPROF is not set @@ -282,7 +280,6 @@ CONFIG_I2C_STUB=m ## # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCA9539 is not set -# CONFIG_SENSORS_MAX6875 is not set ## ## file: drivers/ide/Kconfig @@ -314,10 +311,10 @@ CONFIG_I2C_STUB=m ## CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set ## ## file: drivers/input/misc/Kconfig @@ -1017,4 +1014,7 @@ CONFIG_BLK_DEV_IDE_SWARM=y # CONFIG_LAN_SAA9730 is not set # CONFIG_MIPS_ATLAS is not set # CONFIG_MIPS_SEAD is not set +# CONFIG_SENSORS_MAX6875 is not set +CONFIG_SIBYTE_CFE=y +# CONFIG_SIMULATION is not set diff --git a/debian/config/mipsel/config.sb1a-bcm91480b b/debian/config/mipsel/config.sb1a-bcm91480b index 903ebd5bc..4673e63c5 100644 --- a/debian/config/mipsel/config.sb1a-bcm91480b +++ b/debian/config/mipsel/config.sb1a-bcm91480b @@ -108,10 +108,8 @@ CONFIG_CMDLINE="" # CONFIG_CPU_SB1_PASS_2_112x is not set # CONFIG_CPU_SB1_PASS_3 is not set ## end choice -# CONFIG_SIMULATION is not set # CONFIG_SB1_CEX_ALWAYS_FATAL is not set # CONFIG_SB1_CERR_STALL is not set -CONFIG_SIBYTE_CFE=y # CONFIG_SIBYTE_CFE_CONSOLE is not set # CONFIG_SIBYTE_BUS_WATCHER is not set # CONFIG_SIBYTE_TBPROF is not set @@ -282,7 +280,6 @@ CONFIG_I2C_STUB=m ## # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCA9539 is not set -# CONFIG_SENSORS_MAX6875 is not set ## ## file: drivers/ide/Kconfig @@ -343,10 +340,10 @@ CONFIG_BLK_DEV_VIA82CXXX=m ## CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set ## ## file: drivers/input/misc/Kconfig @@ -1045,4 +1042,7 @@ CONFIG_SND_HDA_INTEL=m # CONFIG_LAN_SAA9730 is not set # CONFIG_MIPS_ATLAS is not set # CONFIG_MIPS_SEAD is not set +# CONFIG_SENSORS_MAX6875 is not set +CONFIG_SIBYTE_CFE=y +# CONFIG_SIMULATION is not set diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index be2954fd4..2721276b9 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -321,10 +321,10 @@ CONFIG_INPUT_JOYSTICK=y ## CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=m -# CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set ## ## file: drivers/input/misc/Kconfig @@ -754,7 +754,6 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD_PPC_SOC=y -CONFIG_USB_OHCI_HCD_PPC_OF=y CONFIG_USB_OHCI_HCD_PPC_OF_BE=y CONFIG_USB_OHCI_HCD_PPC_OF_LE=y CONFIG_USB_OHCI_HCD_PCI=y @@ -871,7 +870,6 @@ CONFIG_SOFT_WATCHDOG=m CONFIG_WATCHDOG_RTAS=m CONFIG_PCIPCWATCHDOG=m CONFIG_WDTPCI=m -CONFIG_WDT_501_PCI=y CONFIG_USBPCWATCHDOG=m ## @@ -1072,3 +1070,9 @@ CONFIG_SND_POWERMAC_AUTO_DRC=y ## file: sound/usb/Kconfig ## CONFIG_SND_USB_USX2Y=m + +## +## file: unknown +## +CONFIG_WDT_501_PCI=y + diff --git a/debian/config/powerpc/config.powerpc b/debian/config/powerpc/config.powerpc index bd3eab4f2..15a41f131 100644 --- a/debian/config/powerpc/config.powerpc +++ b/debian/config/powerpc/config.powerpc @@ -28,7 +28,6 @@ CONFIG_PPC_CHRP=y ## # CONFIG_PPC64 is not set ## choice: Processor Type -CONFIG_6xx=y # CONFIG_PPC_85xx is not set # CONFIG_PPC_8xx is not set # CONFIG_40x is not set diff --git a/debian/config/s390/config b/debian/config/s390/config index 3903bd4d2..b31067d4f 100644 --- a/debian/config/s390/config +++ b/debian/config/s390/config @@ -134,6 +134,7 @@ CONFIG_ZFCP=m ## ## file: drivers/staging/speakup/Kconfig ## +# CONFIG_SPEAKUP is not set # CONFIG_SPEAKUP_SYNTH_ACNTSA is not set # CONFIG_SPEAKUP_SYNTH_ACNTPC is not set # CONFIG_SPEAKUP_SYNTH_APOLLO is not set @@ -148,7 +149,6 @@ CONFIG_ZFCP=m # CONFIG_SPEAKUP_SYNTH_SPKOUT is not set # CONFIG_SPEAKUP_SYNTH_TXPRT is not set # CONFIG_SPEAKUP_SYNTH_DUMMY is not set -# CONFIG_SPEAKUP is not set ## ## file: drivers/watchdog/Kconfig diff --git a/debian/config/sparc/config b/debian/config/sparc/config index d4016790b..e87a61b60 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -60,10 +60,10 @@ CONFIG_PRINTER=m ## CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -CONFIG_KEYBOARD_SUNKBD=y CONFIG_KEYBOARD_LKKBD=m -# CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +CONFIG_KEYBOARD_SUNKBD=y +# CONFIG_KEYBOARD_XTKBD is not set ## ## file: drivers/input/misc/Kconfig