[kernel] r8686 - in dists/trunk/linux-2.6/debian: . arch/amd64 arch/i386

[Maximilian Attems]

Author: maks
Date: Mon May 21 20:26:15 2007
New Revision: 8686

Log:
i386, amd64: enable CONFIG_PHANTOM


Modified:
   dists/trunk/linux-2.6/debian/arch/amd64/config
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/changelog

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config	Mon May 21 20:26:15 2007
@@ -902,6 +902,7 @@
 # CONFIG_I2C_DEBUG_CHIP is not set
 CONFIG_W1=m
 CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_BWQCAM=m

Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	Mon May 21 20:26:15 2007
@@ -1094,6 +1094,7 @@
 # CONFIG_I2C_DEBUG_CHIP is not set
 CONFIG_W1=m
 CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_PMS=m

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Mon May 21 20:26:15 2007
@@ -10,12 +10,12 @@
   * Enable TCP_CONG_YEAH, TCP_CONG_ILLINOIS, NF_CONNTRACK_SANE, DM_DELAY,
     GIGASET_M101 and disable SCSI_ESP_CORE in topconfig.
   * [amd64, i386]: Take care of the renaming acpi-ibm to thinkpad-acpi.
-    Enable KINGSUN_DONGLE, AF_RXRPC, RXKAD, MTD_NAND_PLATFORM, BLINK.
+    Enable KINGSUN_DONGLE, AF_RXRPC, RXKAD, MTD_NAND_PLATFORM, BLINK, PHANTOM.
   * Enable WLAN_PRE80211 and WLAN_80211 on all archs with NET_RADIO enabled.
   * Fix RTC_INTF_{DEV,SYSFS,PROC}=y where enabled modular.
   * Enable new wirless stack mac80211 and improved wireless conf api.
 
- -- maximilian attems <maks at debian.org>  Mon, 21 May 2007 22:23:36 +0200
+ -- maximilian attems <maks at debian.org>  Mon, 21 May 2007 22:27:51 +0200
 
 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low