[kernel] r9623 - in dists/sid/linux-2.6/debian: . arch/ia64

[Dann Frazier]

Author: dannf
Date: Tue Oct  9 19:54:01 2007
New Revision: 9623

Log:
* [ia64] Re-enable various unintentionally disabled config options

Modified:
   dists/sid/linux-2.6/debian/arch/ia64/config
   dists/sid/linux-2.6/debian/changelog

Modified: dists/sid/linux-2.6/debian/arch/ia64/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/ia64/config	(original)
+++ dists/sid/linux-2.6/debian/arch/ia64/config	Tue Oct  9 19:54:01 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
@@ -748,6 +780,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

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Oct  9 19:54:01 2007
@@ -104,9 +104,9 @@
   * Fix tainted check in bug scripts.
 
   [ dann frazier ]
-  * [ia64] Enable cciss module
+  * [ia64] Re-enable various unintentionally disabled config options
 
- -- maximilian attems <maks at debian.org>  Mon, 08 Oct 2007 23:39:51 +0200
+ -- dann frazier <dannf at debian.org>  Tue, 09 Oct 2007 13:53:17 -0600
 
 linux-2.6 (2.6.22-4) unstable; urgency=low