group partition types

explicitly disable sysv68 motorola delta specific partition table support
(default n, disabled in fedora too)

svn path=/dists/trunk/linux-2.6/; revision=8845
This commit is contained in:
Maximilian Attems 2007-05-31 14:52:03 +00:00
parent be6c268a52
commit 37cae26ceb
2 changed files with 9 additions and 4 deletions

9
debian/arch/config vendored
View File

@ -568,9 +568,14 @@ CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_BIND34=y
#
# Partition Types
#
CONFIG_PARTITION_ADVANCED=y
CONFIG_MSDOS_PARTITION=y
# CONFIG_PRINTK_TIME is not set
CONFIG_KARMA_PARTITION=y
# CONFIG_SYSV68_PARTITION is not set
#
# Cryptographic options
@ -1231,7 +1236,6 @@ CONFIG_SBC_EPX_C3_WATCHDOG=m
CONFIG_YENTA_O2=y
CONFIG_SND_PCXHR=m
CONFIG_IFB=m
CONFIG_KARMA_PARTITION=y
# CONFIG_USB_LIBUSUAL is not set
CONFIG_CONFIGFS_FS=m
CONFIG_USB_STORAGE_ALAUDA=y
@ -1566,3 +1570,4 @@ CONFIG_PATA_MARVELL=m
# CONFIG_ITCO_VENDOR_SUPPORT is not set
CONFIG_WAN_ROUTER_DRIVERS=m
# CONFIG_FORCEDETH_NAPI is not set
# CONFIG_PRINTK_TIME is not set

4
debian/changelog vendored
View File

@ -14,7 +14,7 @@ linux-2.6 (2.6.22~rc3-1~experimental.1) UNRELEASED; urgency=low
I2C_SIMTEC, I2C_TINY_USB, SC92031, LIBERTAS_USB, RFKILL, RFKILL_INPUT,
MTD_UBI, SND_USB_CAIAQ, SND_USB_CAIAQ_INPUT, USB_BERRY_CHARGE,
RTC_DRV_MAX6900, SUNRPC_BIND34 and disable SCSI_ESP_CORE, SPI_SPIDEV,
CRYPT_CRYPTD in topconfig.
CRYPT_CRYPTD, SYSV68_PARTITION in topconfig.
* [amd64, i386]: Take care of the renaming acpi-ibm to thinkpad-acpi.
Enable KINGSUN_DONGLE, AF_RXRPC, RXKAD, MTD_NAND_PLATFORM, BLINK, PHANTOM.
Disable OSS_OBSOLETE.
@ -40,7 +40,7 @@ linux-2.6 (2.6.22~rc3-1~experimental.1) UNRELEASED; urgency=low
on ARM.
* arm/ixp4xx: Add patch to set NSLU2 timer frequency.
-- maximilian attems <maks@debian.org> Thu, 31 May 2007 16:46:51 +0200
-- maximilian attems <maks@debian.org> Thu, 31 May 2007 16:51:21 +0200
linux-2.6 (2.6.21-3) UNRELEASED; urgency=low