[kernel] r9649 - in dists/trunk/linux-2.6/debian: . config/ia64
Dann Frazier
dannf at alioth.debian.org
Fri Oct 12 05:25:32 UTC 2007
Author: dannf
Date: Fri Oct 12 05:25:31 2007
New Revision: 9649
Log:
merge ia64 config changes from sid (2.6.22) branch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/ia64/config
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Fri Oct 12 05:25:31 2007
@@ -95,9 +95,9 @@
* Clean up new amd64 options
[ dann frazier ]
- * [ia64] Enable cciss module
+ * [ia64] Re-enable various unintentionally disabled config options
- -- maximilian attems <maks at debian.org> Wed, 03 Oct 2007 21:16:37 +0200
+ -- dann frazier <dannf at debian.org> Thu, 11 Oct 2007 23:17:17 -0600
linux-2.6 (2.6.22-5) UNRELEASED; urgency=low
Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config (original)
+++ dists/trunk/linux-2.6/debian/config/ia64/config Fri Oct 12 05:25:31 2007
@@ -107,7 +107,26 @@
CONFIG_NET_FC=y
CONFIG_SHAPER=m
CONFIG_NETCONSOLE=m
-# CONFIG_ISDN is not set
+CONFIG_ISDN=m
+CONFIG_ISDN_CAPI=m
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_CAPI_TRACE=y
+# CONFIG_ISDN_CAPI_MIDDLEWARE is not set
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
CONFIG_PHONE=m
CONFIG_PHONE_IXJ=m
CONFIG_PHONE_IXJ_PCMCIA=m
@@ -213,6 +232,17 @@
CONFIG_SERIAL_SGI_L1_CONSOLE=y
CONFIG_SERIAL_JSM=m
CONFIG_BLK_CPQ_CISS_DA=m
+CONFIG_CISS_SCSI_TAPE=y
+CONFIG_BLK_DEV_DAC960=m
+CONFIG_BLK_DEV_UMEM=m
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_SX8=m
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
CONFIG_SERIAL_SGI_IOC4=m
CONFIG_SERIAL_SGI_IOC3=m
CONFIG_PRINTER=m
@@ -242,7 +272,9 @@
CONFIG_DRM_SIS=m
CONFIG_SYNCLINK_CS=m
CONFIG_RAW_DRIVER=m
-# CONFIG_HPET is not set
+CONFIG_HPET=y
+# CONFIG_HPET_RTC_IRQ is not set
+# CONFIG_HPET_MMAP is not set
CONFIG_MAX_RAW_DEVS=256
CONFIG_HANGCHECK_TIMER=m
CONFIG_MMTIMER=m
@@ -740,6 +772,28 @@
CONFIG_PCCARD_NONSTATIC=m
CONFIG_HAMRADIO=y
CONFIG_IRDA=m
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+CONFIG_IRDA_ULTRA=y
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+CONFIG_IRTTY_SIR=m
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_VLSI_FIR=m
CONFIG_BT=m
CONFIG_IDE=m
CONFIG_IDE_MAX_HWIFS=4
More information about the Kernel-svn-changes
mailing list