UBUNTU: [Config] CONFIG_RTS_PSTOR=m

BugLink: http://bugs.launchpad.net/bugs/698006

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index d82e93d..ae23281 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3917,6 +3917,8 @@ CONFIG_RTL8187_LEDS=y
 CONFIG_RTL8192SE=m
 CONFIG_RTL8192U=m
 CONFIG_RTLWIFI=m
+CONFIG_RTS_PSTOR=m
+# CONFIG_RTS_PSTOR_DEBUG is not set
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_RT_MUTEX_TESTER is not set

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 4d341ee..2f840a5 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -71,10 +71,13 @@ CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
 # CONFIG_ET131X is not set
 # CONFIG_EZX_PCAP is not set
 CONFIG_FB_3DFX=y
+CONFIG_FB_ATY128=m
 CONFIG_FB_BACKLIGHT=y
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
 CONFIG_FB_DDC=y
 CONFIG_FB_MACMODES=y
+CONFIG_FB_MATROX=m
+CONFIG_FB_RADEON=m
 CONFIG_FB_S1D13XXX=m
 CONFIG_FB_SAVAGE=m
 CONFIG_FB_SVGALIB=m

diff --git a/debian.master/config/powerpc/config.flavour.powerpc b/debian.master/config/powerpc/config.flavour.powerpc
index 01a6ba9..a303e9d 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc
+++ b/debian.master/config/powerpc/config.flavour.powerpc
@@ -9,9 +9,6 @@
 # CONFIG_CRASH_DUMP is not set
 CONFIG_CRYPTO_LZO=m
 CONFIG_FB_ATY=y
-CONFIG_FB_ATY128=m
-CONFIG_FB_MATROX=m
-CONFIG_FB_RADEON=m
 CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_FOPS=m

diff --git a/debian.master/config/powerpc/config.flavour.powerpc-smp b/debian.master/config/powerpc/config.flavour.powerpc-smp
index b7e4153..08a6050 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc-smp
+++ b/debian.master/config/powerpc/config.flavour.powerpc-smp
@@ -9,9 +9,6 @@ CONFIG_CFG80211_REG_DEBUG=y
 # CONFIG_CRASH_DUMP is not set
 CONFIG_CRYPTO_LZO=m
 CONFIG_FB_ATY=m
-CONFIG_FB_ATY128=m
-CONFIG_FB_MATROX=m
-CONFIG_FB_RADEON=m
 CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_FOPS=m

diff --git a/debian.master/config/powerpc/config.flavour.powerpc64-smp b/debian.master/config/powerpc/config.flavour.powerpc64-smp
index d053865..f1cab48 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc64-smp
+++ b/debian.master/config/powerpc/config.flavour.powerpc64-smp
@@ -9,9 +9,6 @@ CONFIG_ATA_NONSTANDARD=y
 CONFIG_CRASH_DUMP=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_FB_ATY=m
-CONFIG_FB_ATY128=m
-CONFIG_FB_MATROX=m
-CONFIG_FB_RADEON=m
 CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_FILLRECT=y
 CONFIG_FB_SYS_FOPS=y