[kernel] r6020 - in people/waldi/linux-2.6: . debian/arch/mips debian/arch/mipsel

Bastian Blank waldi at costa.debian.org
Thu Mar 2 13:58:43 UTC 2006 

Author: waldi
Date: Thu Mar  2 13:58:42 2006
New Revision: 6020

Modified:
   people/waldi/linux-2.6/   (props changed)
   people/waldi/linux-2.6/debian/arch/mips/config.r4k-ip22
   people/waldi/linux-2.6/debian/arch/mips/config.r5k-ip32
   people/waldi/linux-2.6/debian/arch/mips/config.sb1-bcm91250a
   people/waldi/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a
Log:
Merge /dists/trunk/linux-2.6.


Modified: people/waldi/linux-2.6/debian/arch/mips/config.r4k-ip22
==============================================================================
--- people/waldi/linux-2.6/debian/arch/mips/config.r4k-ip22	(original)
+++ people/waldi/linux-2.6/debian/arch/mips/config.r4k-ip22	Thu Mar  2 13:58:42 2006
@@ -552,7 +552,7 @@
 #
 # SCSI device support
 #
-# CONFIG_RAID_ATTRS is not set
+CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
 CONFIG_SCSI_PROC_FS=y
 
@@ -570,7 +570,7 @@
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
 #
-# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_CONSTANTS=y
 # CONFIG_SCSI_LOGGING is not set
 
@@ -578,9 +578,9 @@
 # SCSI Transport Attributes
 #
 CONFIG_SCSI_SPI_ATTRS=y
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
 
 #
 # SCSI low-level drivers
@@ -777,7 +777,7 @@
 # Hardware I/O ports
 #
 CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
+# CONFIG_SERIO_I8042 is not set
 CONFIG_SERIO_SERPORT=y
 # CONFIG_SERIO_PARKBD is not set
 CONFIG_SERIO_LIBPS2=y
@@ -837,7 +837,7 @@
 # CONFIG_WDT is not set
 CONFIG_RTC=m
 CONFIG_SGI_DS1286=y
-CONFIG_GEN_RTC=m
+CONFIG_GEN_RTC=y
 CONFIG_GEN_RTC_X=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
@@ -918,7 +918,7 @@
 # Hardware Monitoring support
 #
 CONFIG_HWMON=y
-# CONFIG_HWMON_VID is not set
+CONFIG_HWMON_VID=m
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
@@ -1013,9 +1013,9 @@
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set

Modified: people/waldi/linux-2.6/debian/arch/mips/config.r5k-ip32
==============================================================================
--- people/waldi/linux-2.6/debian/arch/mips/config.r5k-ip32	(original)
+++ people/waldi/linux-2.6/debian/arch/mips/config.r5k-ip32	Thu Mar  2 13:58:42 2006
@@ -523,7 +523,7 @@
 #
 CONFIG_PARPORT=m
 # CONFIG_PARPORT_PC is not set
-# CONFIG_PARPORT_IP32 is not set
+CONFIG_PARPORT_IP32=m
 # CONFIG_PARPORT_GSC is not set
 CONFIG_PARPORT_1284=y
 
@@ -558,7 +558,7 @@
 #
 # SCSI device support
 #
-CONFIG_RAID_ATTRS=y
+CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
 CONFIG_SCSI_PROC_FS=y
 
@@ -570,7 +570,7 @@
 # CONFIG_CHR_DEV_OSST is not set
 CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=y
+CONFIG_CHR_DEV_SG=m
 CONFIG_CHR_DEV_SCH=m
 
 #
@@ -584,9 +584,9 @@
 # SCSI Transport Attributes
 #
 CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_FC_ATTRS=y
-CONFIG_SCSI_ISCSI_ATTRS=y
-CONFIG_SCSI_SAS_ATTRS=y
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
 
 #
 # SCSI low-level drivers
@@ -617,7 +617,7 @@
 # CONFIG_SCSI_IPR is not set
 # CONFIG_SCSI_QLOGIC_FC is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
-CONFIG_SCSI_QLA_FC=m
+# CONFIG_SCSI_QLA_FC is not set
 # CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE is not set
 # CONFIG_SCSI_LPFC is not set
 # CONFIG_SCSI_DC395x is not set
@@ -798,7 +798,7 @@
 # CONFIG_KEYBOARD_NEWTON is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
-CONFIG_MOUSE_SERIAL=y
+# CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
@@ -913,7 +913,7 @@
 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_I810 is not set
 # CONFIG_I2C_PIIX4 is not set
-CONFIG_I2C_ISA=m
+# CONFIG_I2C_ISA is not set
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_PARPORT is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
@@ -1002,7 +1002,7 @@
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VIA686A is not set
-CONFIG_SENSORS_VT8231=m
+# CONFIG_SENSORS_VT8231 is not set
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83792D is not set
 # CONFIG_SENSORS_W83L785TS is not set
@@ -1120,7 +1120,7 @@
 #
 # Sound
 #
-CONFIG_SOUND=y
+CONFIG_SOUND=m
 
 #
 # Advanced Linux Sound Architecture
@@ -1181,7 +1181,7 @@
 # CONFIG_SND_MAESTRO3 is not set
 # CONFIG_SND_MIXART is not set
 # CONFIG_SND_NM256 is not set
-CONFIG_SND_PCXHR=m
+# CONFIG_SND_PCXHR is not set
 # CONFIG_SND_RME32 is not set
 # CONFIG_SND_RME96 is not set
 # CONFIG_SND_RME9652 is not set
@@ -1199,7 +1199,7 @@
 #
 # Open Sound System
 #
-CONFIG_SOUND_PRIME=y
+CONFIG_SOUND_PRIME=m
 # CONFIG_OBSOLETE_OSS_DRIVER is not set
 # CONFIG_SOUND_FUSION is not set
 # CONFIG_SOUND_ICH is not set

Modified: people/waldi/linux-2.6/debian/arch/mips/config.sb1-bcm91250a
==============================================================================
--- people/waldi/linux-2.6/debian/arch/mips/config.sb1-bcm91250a	(original)
+++ people/waldi/linux-2.6/debian/arch/mips/config.sb1-bcm91250a	Thu Mar  2 13:58:42 2006
@@ -997,7 +997,7 @@
 #
 # CONFIG_USBPCWATCHDOG is not set
 CONFIG_RTC=m
-CONFIG_GEN_RTC=m
+CONFIG_GEN_RTC=y
 CONFIG_GEN_RTC_X=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set

Modified: people/waldi/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a
==============================================================================
--- people/waldi/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a	(original)
+++ people/waldi/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a	Thu Mar  2 13:58:42 2006
@@ -997,7 +997,7 @@
 #
 # CONFIG_USBPCWATCHDOG is not set
 CONFIG_RTC=m
-CONFIG_GEN_RTC=m
+CONFIG_GEN_RTC=y
 CONFIG_GEN_RTC_X=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set

More information about the Kernel-svn-changes mailing list