Merge branch 'deprecated'

svn path=/dists/trunk/linux-2.6/; revision=13131
This commit is contained in:
Maximilian Attems 2009-03-16 16:41:00 +00:00
parent 661150691a
commit 8f5eba2f49
5 changed files with 10 additions and 15 deletions

2
debian/changelog vendored
View File

@ -42,6 +42,8 @@ linux-2.6 (2.6.29~rc8-1~experimental.1) UNRELEASED; urgency=low
* [x86_32] set BLK_DEV_CS5536.
* [powerpc] set PHANTOM, HP_ILO, MV643XX_ETH, MOUSE_BCM5974, VIRTUALIZATION,
VIRTIO_PCI, VIRTIO_BALLOON, VIRTIO_BLK, VIRTIO_NET.
* topconfig unset legacy SCSI_PROC_FS, PCMCIA_IOCTL, ACPI_PROCFS,
ACPI_PROCFS_POWER, ACPI_PROC_EVENT.
[ Bastian Blank ]
* Use external source directory for all builds.

View File

@ -134,10 +134,10 @@ CONFIG_CRYPTO_TWOFISH_X86_64=m
## file: drivers/acpi/Kconfig
##
CONFIG_ACPI=y
CONFIG_ACPI_PROCFS=y
CONFIG_ACPI_PROCFS_POWER=y
# CONFIG_ACPI_PROCFS is not set
# CONFIG_ACPI_PROCFS_POWER is not set
CONFIG_ACPI_SYSFS_POWER=y
CONFIG_ACPI_PROC_EVENT=y
# CONFIG_ACPI_PROC_EVENT is not set
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
CONFIG_ACPI_BUTTON=m

View File

@ -1559,7 +1559,7 @@ CONFIG_HOTPLUG_PCI_CPCI=y
## file: drivers/pcmcia/Kconfig
##
CONFIG_PCMCIA_LOAD_CIS=y
CONFIG_PCMCIA_IOCTL=y
# CONFIG_PCMCIA_IOCTL is not set
CONFIG_YENTA_O2=y
CONFIG_YENTA_RICOH=y
CONFIG_YENTA_TI=y
@ -1655,7 +1655,7 @@ CONFIG_RTC_DRV_PCF50633=m
CONFIG_RAID_ATTRS=m
CONFIG_SCSI=m
CONFIG_SCSI_TGT=m
CONFIG_SCSI_PROC_FS=y
# CONFIG_SCSI_PROC_FS is not set
CONFIG_BLK_DEV_SD=m
CONFIG_CHR_DEV_ST=m
CONFIG_CHR_DEV_OSST=m

View File

@ -198,10 +198,10 @@ CONFIG_CRYPTO_TWOFISH_586=m
## file: drivers/acpi/Kconfig
##
CONFIG_ACPI=y
CONFIG_ACPI_PROCFS=y
CONFIG_ACPI_PROCFS_POWER=y
# CONFIG_ACPI_PROCFS is not set
# CONFIG_ACPI_PROCFS_POWER is not set
CONFIG_ACPI_SYSFS_POWER=y
CONFIG_ACPI_PROC_EVENT=y
# CONFIG_ACPI_PROC_EVENT is not set
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
CONFIG_ACPI_BUTTON=m

View File

@ -595,15 +595,8 @@ CONFIG_PCIEAER=y
##
CONFIG_PCCARD=m
CONFIG_PCMCIA=m
CONFIG_PCMCIA_LOAD_CIS=y
CONFIG_PCMCIA_IOCTL=y
CONFIG_CARDBUS=y
CONFIG_YENTA=m
CONFIG_YENTA_O2=y
CONFIG_YENTA_RICOH=y
CONFIG_YENTA_TI=y
CONFIG_YENTA_ENE_TUNE=y
CONFIG_YENTA_TOSHIBA=y
CONFIG_PD6729=m
CONFIG_I82092=m