This revert changed the minimum x86 CPU model supported by the i386 ARCH.
updateconfigs should have been run after this commit.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
debian.master/config/i386/config.flavour.generic | 2 +-
debian.master/config/lpia/config.common.lpia | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/i386/config.flavour.generic b/debian.master/config/i386/config.flavour.generic
index c36c97b..c854de1 100644
--- a/debian.master/config/i386/config.flavour.generic
+++ b/debian.master/config/i386/config.flavour.generic
@@ -11,4 +11,4 @@ CONFIG_HIGHMEM4G=y
CONFIG_M586=y
# CONFIG_PHYS_ADDR_T_64BIT is not set
CONFIG_X86_L1_CACHE_SHIFT=5
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_MINIMUM_CPU_FAMILY=4
diff --git a/debian.master/config/lpia/config.common.lpia b/debian.master/config/lpia/config.common.lpia
index 453d702..7374bba 100644
--- a/debian.master/config/lpia/config.common.lpia
+++ b/debian.master/config/lpia/config.common.lpia
@@ -263,7 +263,7 @@ CONFIG_X86_32=y
# CONFIG_X86_64 is not set
# CONFIG_X86_CPU_DEBUG is not set
CONFIG_X86_L1_CACHE_SHIFT=5
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_MINIMUM_CPU_FAMILY=4
CONFIG_X86_SPEEDSTEP_LIB=y
# CONFIG_ZONE_DMA32 is not set
CONFIG_ZONE_DMA_FLAG=1
--
1.6.2.4