Merge /dists/sid/linux-2.6 (2.6.32-13).

svn path=/dists/trunk/linux-2.6/; revision=15735

11 files changed, 18 insertions, 11 deletions

diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines
index 71edc6e1c..b5f208957 100644
--- a/debian/config/amd64/defines
+++ b/debian/config/amd64/defines
@@ -12,6 +12,9 @@ configs:
  kernelarch-x86/config
 suggests: grub | lilo
 
+[image-dbg]
+enabled: true
+
 [amd64_description]
 hardware: 64-bit PCs
 hardware-long: PCs with AMD64 or Intel 64 processors
diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood
index 5d948acc8..bd01ae28a 100644
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@@ -59,6 +59,7 @@ CONFIG_MACH_RD88F6192_NAS=y
 CONFIG_MACH_RD88F6281=y
 CONFIG_MACH_SHEEVAPLUG=y
 CONFIG_MACH_ESATA_SHEEVAPLUG=y
+CONFIG_MACH_GURUPLUG=y
 CONFIG_MACH_TS219=y
 CONFIG_MACH_TS41X=y
 CONFIG_MACH_OPENRD=y
diff --git a/debian/config/config b/debian/config/config
index 329781971..d4f45aaca 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -114,7 +114,7 @@ CONFIG_PATA_ARTOP=m
 CONFIG_PATA_ATP867X=m
 # CONFIG_PATA_ATIIXP is not set
 # CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_CMD64X is not set
+CONFIG_PATA_CMD64X=m
 # CONFIG_PATA_CS5520 is not set
 # CONFIG_PATA_CS5530 is not set
 # CONFIG_PATA_CYPRESS is not set
@@ -4042,7 +4042,7 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 ##
 ## file: security/tomoyo/Kconfig
 ##
-# CONFIG_SECURITY_TOMOYO is not set
+CONFIG_SECURITY_TOMOYO=y
 
 ##
 ## file: sound/Kconfig
diff --git a/debian/config/featureset-xen/defines b/debian/config/featureset-xen/defines
index 780433b09..c9a5a6466 100644
--- a/debian/config/featureset-xen/defines
+++ b/debian/config/featureset-xen/defines
@@ -4,5 +4,8 @@ part-long-xen: This kernel also runs on a Xen hypervisor.
  It supports both privileged (dom0) and unprivileged (domU) operation.
 part-short-xen: Xen dom0 support
 
+[image-dbg]
+enabled: true
+
 [xen]
 dom0-support: true
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index 4583b4f8e..72fe4f7ff 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -106,7 +106,7 @@ CONFIG_IDE_GENERIC=m
 # CONFIG_BLK_DEV_AEC62XX is not set
 # CONFIG_BLK_DEV_ALI15X3 is not set
 # CONFIG_BLK_DEV_AMD74XX is not set
-CONFIG_BLK_DEV_CMD64X=m
+# CONFIG_BLK_DEV_CMD64X is not set
 # CONFIG_BLK_DEV_TRIFLEX is not set
 # CONFIG_BLK_DEV_CY82C693 is not set
 # CONFIG_BLK_DEV_CS5520 is not set
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index 367df2eaf..2512e4046 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -42,6 +42,9 @@ configs:
  kernelarch-x86/config-arch-32
 recommends: libc6-i686
 
+[686-bigmem_image-dbg]
+enabled: true
+
 [amd64_description]
 hardware: 64-bit PCs
 hardware-long: PCs with AMD64 or Intel 64 processors
diff --git a/debian/config/i386/openvz/defines b/debian/config/i386/openvz/defines
index 28dd50918..c4635f300 100644
--- a/debian/config/i386/openvz/defines
+++ b/debian/config/i386/openvz/defines
@@ -6,3 +6,5 @@ flavours:
 configs:
   i386/none/config.686-bigmem
 
+[686_image-dbg]
+enabled: true
diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64
index d3541bc32..673e3ee47 100644
--- a/debian/config/kernelarch-x86/config-arch-64
+++ b/debian/config/kernelarch-x86/config-arch-64
@@ -41,7 +41,7 @@ CONFIG_XEN_MAX_DOMAIN_MEMORY=32
 ## file: crypto/Kconfig
 ##
 CONFIG_CRYPTO_AES_X86_64=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
+# CONFIG_CRYPTO_AES_NI_INTEL is not set
 CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64=m
 
diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a
index ae6280d06..f3289e4c2 100644
--- a/debian/config/mips/config.sb1-bcm91250a
+++ b/debian/config/mips/config.sb1-bcm91250a
@@ -200,11 +200,6 @@ CONFIG_USB_HID=m
 ##
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
 # CONFIG_SENSORS_ASB100 is not set
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS1621 is not set
diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config
index 59afedfcb..50c295c45 100644
--- a/debian/config/powerpc/config
+++ b/debian/config/powerpc/config
@@ -278,7 +278,7 @@ CONFIG_BLK_DEV_GENERIC=m
 CONFIG_BLK_DEV_AEC62XX=m
 # CONFIG_BLK_DEV_ALI15X3 is not set
 # CONFIG_BLK_DEV_AMD74XX is not set
-CONFIG_BLK_DEV_CMD64X=m
+# CONFIG_BLK_DEV_CMD64X is not set
 # CONFIG_BLK_DEV_TRIFLEX is not set
 # CONFIG_BLK_DEV_CY82C693 is not set
 # CONFIG_BLK_DEV_CS5520 is not set
diff --git a/debian/config/sparc/config b/debian/config/sparc/config
index 3bedd07cf..451971fb1 100644
--- a/debian/config/sparc/config
+++ b/debian/config/sparc/config
@@ -150,7 +150,7 @@ CONFIG_BLK_DEV_GENERIC=m
 # CONFIG_BLK_DEV_AEC62XX is not set
 CONFIG_BLK_DEV_ALI15X3=m
 # CONFIG_BLK_DEV_AMD74XX is not set
-CONFIG_BLK_DEV_CMD64X=m
+# CONFIG_BLK_DEV_CMD64X is not set
 # CONFIG_BLK_DEV_TRIFLEX is not set
 CONFIG_BLK_DEV_CY82C693=m
 CONFIG_BLK_DEV_CS5520=m