UBUNTU: [Config] updateconfigs following rebase to v2.6.38-rc6

Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index edf48dd..aebe5da 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -64,7 +64,6 @@ CONFIG_DAB=y
 CONFIG_DAVICOM_PHY=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_RODATA=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DISPLAY_SUPPORT=m
 # CONFIG_DL2K is not set
 CONFIG_DMADEVICES=y

diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 96bdf60..ca204c6 100644 (file)
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -47,7 +47,6 @@ CONFIG_DEBUG_RODATA=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 # CONFIG_DL2K is not set
 CONFIG_DMADEVICES=y
 CONFIG_DM_MIRROR=y

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 8e02d92..90acf76 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1114,6 +1114,7 @@ CONFIG_DECOMPRESS_LZO=y
 CONFIG_DECOMPRESS_XZ=y
 CONFIG_DEFAULT_CUBIC=y
 CONFIG_DEFAULT_IO_DELAY_TYPE=1
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 # CONFIG_DEFAULT_NOOP is not set
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_SECURITY="apparmor"
@@ -3877,6 +3878,7 @@ CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_LIB=y

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index f6719f0..42ed9c5 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -63,7 +63,6 @@ CONFIG_DEBUG_INFO=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DISPLAY_SUPPORT=m
 # CONFIG_DL2K is not set
 CONFIG_DMADEVICES=y

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index b1ad2eb..356bd3f 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -56,7 +56,6 @@ CONFIG_DEBUG_RODATA=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DISPLAY_SUPPORT=m
 CONFIG_DL2K=m
 # CONFIG_DMADEVICES is not set

diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 780b8b5..8e5ee36 100644 (file)
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -60,7 +60,6 @@ CONFIG_DAVICOM_PHY=m
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DISPLAY_SUPPORT=m
 CONFIG_DL2K=m
 # CONFIG_DMADEVICES is not set