From 6eaf99c0fedd7ac83722e178543ba0639a2815e5 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Mon, 21 May 2007 20:26:15 +0000 Subject: [PATCH] i386, amd64: enable CONFIG_PHANTOM svn path=/dists/trunk/linux-2.6/; revision=8686 --- debian/arch/amd64/config | 1 + debian/arch/i386/config | 1 + debian/changelog | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index d4f807ffb..38d09f60f 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -902,6 +902,7 @@ CONFIG_SENSORS_PCF8591=m # 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 diff --git a/debian/arch/i386/config b/debian/arch/i386/config index 1bfeb5c1c..ef29d09f6 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -1094,6 +1094,7 @@ CONFIG_SENSORS_PCF8591=m # 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 diff --git a/debian/changelog b/debian/changelog index a97f28183..a01aad35b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,12 +10,12 @@ linux-2.6 (2.6.22~rc2-1~experimental.1) UNRELEASED; urgency=low * 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 Mon, 21 May 2007 22:23:36 +0200 + -- maximilian attems Mon, 21 May 2007 22:27:51 +0200 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low