[kernel] r17066 - in dists/trunk/linux-2.6/debian: . config/mips
Aurelien Jarno
aurel32 at alioth.debian.org
Sun Mar 13 23:44:07 UTC 2011
Author: aurel32
Date: Sun Mar 13 23:44:03 2011
New Revision: 17066
Log:
* mips/malta-[45]kc:
- disable ATM, TR, WAN.
- synchronize options in malta-4kc and malta-5kc.
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Sun Mar 13 06:45:57 2011 (r17065)
+++ dists/trunk/linux-2.6/debian/changelog Sun Mar 13 23:44:03 2011 (r17066)
@@ -9,6 +9,11 @@
- adfs,appletalk,i810,ufs,usbip: Refactor locking
- hpfs: Disable HPFS_FS
+ [ Aurelien Jarno]
+ * mips/malta-[45]kc:
+ - disable ATM, TR, WAN.
+ - synchronize options in malta-4kc and malta-5kc.
+
-- Ben Hutchings <ben at decadent.org.uk> Sat, 12 Mar 2011 08:57:58 +0000
linux-2.6 (2.6.38~rc8-1~experimental.1) experimental; urgency=low
Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Sun Mar 13 06:45:57 2011 (r17065)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Sun Mar 13 23:44:03 2011 (r17066)
@@ -68,6 +68,7 @@
# CONFIG_MIPS_MT_SMTC is not set
## end choice
# CONFIG_MIPS_VPE_LOADER is not set
+# CONFIG_CPU_HAS_SMARTMIPS is not set
## choice: Timer frequency
# CONFIG_HZ_48 is not set
# CONFIG_HZ_100 is not set
@@ -82,26 +83,6 @@
CONFIG_VIRTUALIZATION=y
##
-## file: arch/mips/alchemy/Kconfig
-##
-## choice: Machine type
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_MIRAGE is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_XXS1500 is not set
-## end choice
-
-##
## file: arch/mips/Kconfig.debug
##
CONFIG_CMDLINE=""
@@ -118,6 +99,7 @@
##
CONFIG_ATA=y
CONFIG_SATA_AHCI=y
+CONFIG_SATA_INIC162X=m
CONFIG_SATA_SIL24=y
# CONFIG_PDC_ADMA is not set
# CONFIG_SATA_QSTOR is not set
@@ -147,39 +129,19 @@
##
## file: drivers/atm/Kconfig
##
-CONFIG_ATM_DRIVERS=y
-CONFIG_ATM_DUMMY=m
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-CONFIG_ATM_HE_USE_SUNI=y
+# CONFIG_ATM_DRIVERS is not set
+
+##
+## file: drivers/auxdisplay/Kconfig
+##
+# CONFIG_KS0108 is not set
##
## file: drivers/block/Kconfig
##
CONFIG_BLK_DEV_FD=m
CONFIG_PARIDE=m
+# CONFIG_BLK_CPQ_DA is not set
CONFIG_BLK_CPQ_CISS_DA=m
CONFIG_CISS_SCSI_TAPE=y
CONFIG_BLK_DEV_DAC960=m
@@ -203,7 +165,6 @@
CONFIG_PARIDE_PG=m
CONFIG_PARIDE_ATEN=m
CONFIG_PARIDE_BPCK=m
-# CONFIG_PARIDE_BPCK6 is not set
CONFIG_PARIDE_COMM=m
CONFIG_PARIDE_DSTR=m
CONFIG_PARIDE_FIT2=m
@@ -239,7 +200,6 @@
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
-CONFIG_DTLK=m
CONFIG_R3964=m
CONFIG_APPLICOM=m
@@ -284,9 +244,11 @@
CONFIG_HWMON=y
# CONFIG_HWMON_DEBUG_CHIP is not set
# CONFIG_SENSORS_ABITUGURU is not set
+CONFIG_SENSORS_AD7418=m
CONFIG_SENSORS_ADM1021=m
CONFIG_SENSORS_ADM1025=m
CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
CONFIG_SENSORS_ADM1031=m
CONFIG_SENSORS_ADM9240=m
# CONFIG_SENSORS_ASB100 is not set
@@ -308,6 +270,7 @@
CONFIG_SENSORS_LM90=m
CONFIG_SENSORS_LM92=m
CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX6650=m
# CONFIG_SENSORS_PC87360 is not set
# CONFIG_SENSORS_PC87427 is not set
CONFIG_SENSORS_PCF8591=m
@@ -352,9 +315,10 @@
# CONFIG_I2C_VIA is not set
# CONFIG_I2C_VIAPRO is not set
# CONFIG_I2C_OCORES is not set
+CONFIG_I2C_SIMTEC=m
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PARPORT_LIGHT=m
-# CONFIG_I2C_PCA_ISA is not set
+CONFIG_I2C_TINY_USB=m
# CONFIG_I2C_STUB is not set
##
@@ -397,6 +361,11 @@
##
CONFIG_INPUT_MOUSE=y
CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
CONFIG_MOUSE_SERIAL=m
CONFIG_MOUSE_APPLETOUCH=m
CONFIG_MOUSE_VSXXXAA=m
@@ -448,6 +417,7 @@
CONFIG_ISDN_DRV_GIGASET=m
CONFIG_GIGASET_BASE=m
CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
# CONFIG_GIGASET_DEBUG is not set
##
@@ -490,8 +460,14 @@
CONFIG_I2O_PROC=m
##
+## file: drivers/mfd/Kconfig
+##
+CONFIG_MFD_SM501=m
+
+##
## file: drivers/misc/Kconfig
##
+# CONFIG_PHANTOM is not set
# CONFIG_SGI_IOC4 is not set
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
@@ -508,6 +484,11 @@
CONFIG_MMC_BLOCK=m
##
+## file: drivers/mmc/core/Kconfig
+##
+# CONFIG_MMC_UNSAFE_RESUME is not set
+
+##
## file: drivers/mtd/Kconfig
##
CONFIG_MTD=m
@@ -589,11 +570,13 @@
# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_MTD_NAND=m
# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
CONFIG_MTD_NAND_DISKONCHIP=m
# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
CONFIG_MTD_NAND_CAFE=m
+# CONFIG_MTD_NAND_PLATFORM is not set
##
## file: drivers/mtd/onenand/Kconfig
@@ -603,6 +586,19 @@
# CONFIG_MTD_ONENAND_OTP is not set
##
+## file: drivers/mtd/ubi/Kconfig
+##
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+# CONFIG_MTD_UBI_GLUEBI is not set
+
+##
+## file: drivers/mtd/ubi/Kconfig.debug
+##
+# CONFIG_MTD_UBI_DEBUG is not set
+
+##
## file: drivers/net/Kconfig
##
# CONFIG_HAPPYMEAL is not set
@@ -619,6 +615,7 @@
CONFIG_ADAPTEC_STARFIRE=m
CONFIG_B44=m
# CONFIG_FORCEDETH is not set
+# CONFIG_TC35815 is not set
CONFIG_E100=m
CONFIG_FEALNX=m
CONFIG_NATSEMI=m
@@ -633,12 +630,13 @@
CONFIG_EPIC100=m
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=m
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_SC92031=m
CONFIG_NET_POCKET=y
CONFIG_DE600=m
CONFIG_DE620=m
+CONFIG_NETDEV_1000=y
CONFIG_FDDI=y
CONFIG_SKFP=m
CONFIG_HIPPI=y
@@ -668,7 +666,6 @@
CONFIG_IRTTY_SIR=m
CONFIG_USB_IRDA=m
CONFIG_SIGMATEL_FIR=m
-CONFIG_TOSHIBA_FIR=m
CONFIG_VLSI_FIR=m
CONFIG_MCS_FIR=m
@@ -686,6 +683,11 @@
CONFIG_BROADCOM_PHY=m
##
+## file: drivers/net/tokenring/Kconfig
+##
+# CONFIG_TR is not set
+
+##
## file: drivers/net/tulip/Kconfig
##
CONFIG_NET_TULIP=y
@@ -702,20 +704,7 @@
##
## file: drivers/net/wan/Kconfig
##
-CONFIG_WAN=y
-CONFIG_LANMEDIA=m
-CONFIG_PCI200SYN=m
-CONFIG_WANXL=m
-CONFIG_PC300=m
-# CONFIG_PC300_MLPPP is not set
-CONFIG_FARSYNC=m
-CONFIG_DSCC4=m
-# CONFIG_DSCC4_PCISYNC is not set
-# CONFIG_DSCC4_PCI_RST is not set
-CONFIG_DLCI=m
-CONFIG_DLCI_MAX=8
-CONFIG_WAN_ROUTER_DRIVERS=m
-CONFIG_CYCLADES_SYNC=m
+# CONFIG_WAN is not set
##
## file: drivers/net/wireless/Kconfig
@@ -736,6 +725,13 @@
# CONFIG_IPW2200_DEBUG is not set
##
+## file: drivers/net/wireless/libertas/Kconfig
+##
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+# CONFIG_LIBERTAS_DEBUG is not set
+
+##
## file: drivers/net/wireless/orinoco/Kconfig
##
CONFIG_HERMES=m
@@ -770,6 +766,7 @@
##
CONFIG_RTC_DRV_DS1307=m
CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_MAX6900=m
CONFIG_RTC_DRV_RS5C372=m
CONFIG_RTC_DRV_ISL1208=m
CONFIG_RTC_DRV_X1205=m
@@ -788,7 +785,6 @@
##
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_DPT_I2O=m
CONFIG_SCSI_ARCMSR=m
CONFIG_SCSI_HPTIOP=m
CONFIG_SCSI_DMX3191D=m
@@ -806,7 +802,6 @@
CONFIG_SCSI_QLOGIC_1280=m
CONFIG_SCSI_DC395x=m
CONFIG_SCSI_DC390T=m
-CONFIG_SCSI_NSP32=m
CONFIG_SCSI_DEBUG=m
CONFIG_SCSI_SRP=m
@@ -882,6 +877,7 @@
CONFIG_SPI=y
CONFIG_SPI_BITBANG=m
CONFIG_SPI_BUTTERFLY=m
+# CONFIG_SPI_SPIDEV is not set
##
## file: drivers/telephony/Kconfig
@@ -937,6 +933,8 @@
CONFIG_FB_S1D13XXX=m
CONFIG_FB_NVIDIA=m
# CONFIG_FB_NVIDIA_I2C is not set
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
# CONFIG_FB_RIVA is not set
CONFIG_FB_MATROX=m
CONFIG_FB_MATROX_MILLENIUM=y
@@ -946,12 +944,16 @@
CONFIG_FB_MATROX_MAVEN=m
CONFIG_FB_RADEON=m
CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
# CONFIG_FB_RADEON_DEBUG is not set
CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
CONFIG_FB_ATY=m
CONFIG_FB_ATY_CT=y
# CONFIG_FB_ATY_GENERIC_LCD is not set
CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_S3=m
CONFIG_FB_SAVAGE=m
# CONFIG_FB_SAVAGE_I2C is not set
# CONFIG_FB_SAVAGE_ACCEL is not set
@@ -961,7 +963,11 @@
CONFIG_FB_NEOMAGIC=m
CONFIG_FB_KYRO=m
CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+CONFIG_FB_SM501=m
CONFIG_FB_VIRTUAL=m
##
@@ -976,6 +982,11 @@
CONFIG_FONT_8x16=y
##
+## file: drivers/video/display/Kconfig
+##
+CONFIG_DISPLAY_SUPPORT=m
+
+##
## file: drivers/video/logo/Kconfig
##
CONFIG_LOGO=y
@@ -1025,6 +1036,11 @@
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
##
+## file: kernel/power/Kconfig
+##
+# CONFIG_PM is not set
+
+##
## file: lib/Kconfig.debug
##
CONFIG_ENABLE_MUST_CHECK=y
@@ -1130,6 +1146,7 @@
CONFIG_SND_MTS64=m
CONFIG_SND_SERIAL_U16550=m
CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
CONFIG_SND_AC97_POWER_SAVE=y
##
Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Sun Mar 13 06:45:57 2011 (r17065)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Sun Mar 13 23:44:03 2011 (r17066)
@@ -132,28 +132,7 @@
##
## file: drivers/atm/Kconfig
##
-CONFIG_ATM_DRIVERS=y
-CONFIG_ATM_DUMMY=m
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-CONFIG_ATM_HE_USE_SUNI=y
+# CONFIG_ATM_DRIVERS is not set
##
## file: drivers/auxdisplay/Kconfig
@@ -710,7 +689,7 @@
##
## file: drivers/net/tokenring/Kconfig
##
-CONFIG_TR=y
+# CONFIG_TR is not set
##
## file: drivers/net/tulip/Kconfig
@@ -729,27 +708,7 @@
##
## file: drivers/net/wan/Kconfig
##
-CONFIG_WAN=y
-CONFIG_LANMEDIA=m
-CONFIG_HDLC=m
-CONFIG_HDLC_RAW=m
-CONFIG_HDLC_RAW_ETH=m
-CONFIG_HDLC_CISCO=m
-CONFIG_HDLC_FR=m
-CONFIG_HDLC_PPP=m
-CONFIG_PCI200SYN=m
-CONFIG_WANXL=m
-CONFIG_PC300=m
-# CONFIG_PC300_MLPPP is not set
-# CONFIG_PC300TOO is not set
-CONFIG_FARSYNC=m
-CONFIG_DSCC4=m
-# CONFIG_DSCC4_PCISYNC is not set
-# CONFIG_DSCC4_PCI_RST is not set
-CONFIG_DLCI=m
-CONFIG_DLCI_MAX=8
-CONFIG_WAN_ROUTER_DRIVERS=m
-CONFIG_CYCLADES_SYNC=m
+# CONFIG_WAN is not set
##
## file: drivers/net/wireless/Kconfig
More information about the Kernel-svn-changes
mailing list