From 4aff637e49b240dec1d2c55992c7fdc34ed8ada8 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Wed, 12 Sep 2007 14:58:50 +0000
Subject: [PATCH] Drop i386 k7 images.

* debian/changelog: Update.
* debian/config/i386/defines, debian/config/i386/vserver/defines:
  Remove k7 from flavours.
* debian/config/i386/config.k7: Remove.

svn path=/dists/trunk/linux-2.6/; revision=9505
---
 debian/changelog                   |  3 +-
 debian/config/i386/config.k7       | 65 ------------------------------
 debian/config/i386/defines         |  8 ----
 debian/config/i386/vserver/defines |  4 --
 4 files changed, 2 insertions(+), 78 deletions(-)
 delete mode 100644 debian/config/i386/config.k7

diff --git a/debian/changelog b/debian/changelog
index 7adcecf68..cf1ad61e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,12 +31,13 @@ linux-2.6 (2.6.23~rc5-1~experimental.1) UNRELEASED; urgency=low
 
   [ Bastian Blank ]
   * Add unpriviledged only Xen support.
+  * [i386] Drop k7 images.
 
   [ Aurelien Jarno ]
   * [mips, mipsel] Add a 64-bit image (5kc-malta) for the MIPS Malta board.
     (closes: #435677)
 
- -- maximilian attems <maks@debian.org>  Fri, 07 Sep 2007 17:53:33 +0200
+ -- Bastian Blank <waldi@debian.org>  Wed, 12 Sep 2007 16:57:16 +0200
 
 linux-2.6 (2.6.22-2) UNRELEASED; urgency=low
 
diff --git a/debian/config/i386/config.k7 b/debian/config/i386/config.k7
deleted file mode 100644
index 3c43d157c..000000000
--- a/debian/config/i386/config.k7
+++ /dev/null
@@ -1,65 +0,0 @@
-CONFIG_LOCK_KERNEL=y
-CONFIG_STOP_MACHINE=y
-# CONFIG_M386 is not set
-# CONFIG_M686 is not set
-CONFIG_MK7=y
-# CONFIG_X86_GENERIC is not set
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_XADD=y
-CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
-CONFIG_X86_GOOD_APIC=y
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_X86_USE_3DNOW=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=8
-CONFIG_X86_TSC=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_NONFATAL=m
-CONFIG_X86_MCE_P4THERMAL=y
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-CONFIG_HIGHMEM=y
-# CONFIG_HIGHPTE is not set
-# CONFIG_MATH_EMULATION is not set
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-# CONFIG_EISA is not set
-# CONFIG_MCA is not set
-# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-# CONFIG_DMASCC is not set
-# CONFIG_IRPORT_SIR is not set
-# CONFIG_NI5010 is not set
-# CONFIG_PCMCIA_XIRTULIP is not set
-# CONFIG_ISDN_DRV_LOOP is not set
-# CONFIG_HYSDN is not set
-CONFIG_ISDN_DRV_AVMB1_B1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_T1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-# CONFIG_COMPUTONE is not set
-# CONFIG_DIGIEPCA is not set
-# CONFIG_MOXA_INTELLIO is not set
-# CONFIG_RIO is not set
-# CONFIG_STALLION is not set
-# CONFIG_ISTALLION is not set
-# CONFIG_I2C_ELEKTOR is not set
-CONFIG_I2C_STUB=m
-CONFIG_USB_W9968CF=m
-CONFIG_FS_MBCACHE=m
-CONFIG_LOG_BUF_SHIFT=15
-# CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_X86_SMP=y
-CONFIG_X86_HT=y
-CONFIG_X86_TRAMPOLINE=y
-CONFIG_X86_CMPXCHG64=y
-# CONFIG_M486 is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_SUSPEND_SMP=y
-CONFIG_ACPI_HOTPLUG_CPU=y
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index 77e915889..96815b177 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -6,7 +6,6 @@ featuresets:
 flavours:
  486
  686
- k7
  686-bigmem
  amd64
 kernel-arch: i386
@@ -35,13 +34,6 @@ longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with 4-64G RAM
 [686-bigmem_image]
 recommends: libc6-i686
 
-[k7_base]
-class: AMD K7
-longclass: 32bit AMD Duron/Athlon/AthlonXP/Sempron
-
-[k7_image]
-recommends: libc6-i686
-
 [amd64_base]
 class: AMD64
 kernel-arch: x86_64
diff --git a/debian/config/i386/vserver/defines b/debian/config/i386/vserver/defines
index 3aab242e6..f9e5cc0d2 100644
--- a/debian/config/i386/vserver/defines
+++ b/debian/config/i386/vserver/defines
@@ -1,7 +1,6 @@
 [base]
 flavours:
  686
- k7
 kernel-header-dirs: i386
 
 [image]
@@ -10,6 +9,3 @@ recommends: util-vserver, libc6-i686
 [686_image]
 configs: i386/config.686
 
-[k7_image]
-configs: i386/config.k7
-