aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorKeng-Yu Lin <kengyu@canonical.com>2011-09-15 10:42:38 +0800
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 14:49:25 -0700
commit5c4ecbfe21d654f825080dde133cf37ff5e3d12d (patch)
tree846df9c1bbfc8c8ba3025a1c325968651e988c9d /debian.master
parent1ba026f8fcd8489136118e5d179b009994018afa (diff)
downloadlinux-linaro-precise-5c4ecbfe21d654f825080dde133cf37ff5e3d12d.tar.gz
UBUNTU: [Config] Enable CONFIG_RTS5139=m on i386/amd64
This enables the Realtek RTS5139 card reader driver. BugLink: http://bugs.launchpad.net/bugs/824273 Signed-off-by: Keng-Yu Lin <kengyu@canonical.com> Acked-by: Tim Gardner <tim.gardner@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'debian.master')
-rw-r--r--debian.master/config/amd64/config.common.amd641
-rw-r--r--debian.master/config/armel/config.common.armel1
-rw-r--r--debian.master/config/config.common.ubuntu1
-rw-r--r--debian.master/config/i386/config.common.i3861
-rw-r--r--debian.master/config/powerpc/config.common.powerpc1
-rw-r--r--debian.master/config/ppc64/config.common.ppc641
6 files changed, 6 insertions, 0 deletions
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 9e0efc14a37..4b7cacd347d 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -187,6 +187,7 @@ CONFIG_RTC_DRV_TWL4030=m
CONFIG_RTL8192CE=m
CONFIG_RTL8192E=m
CONFIG_RTS_PSTOR=m
+CONFIG_RTS5139=m
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
CONFIG_SATA_SVW=m
CONFIG_SCHEDSTATS=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 834338bb24c..39ee7bd73e5 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -174,6 +174,7 @@ CONFIG_RTC_DRV_TWL4030=y
# CONFIG_RTL8192CE is not set
CONFIG_RTL8192E=m
# CONFIG_RTS_PSTOR is not set
+# CONFIG_RTS5139 is not set
CONFIG_RWSEM_GENERIC_SPINLOCK=y
CONFIG_SATA_SVW=m
CONFIG_SCHEDSTATS=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 99bac6017bf..35b48b21989 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4213,6 +4213,7 @@ CONFIG_RTL8192SE=m
CONFIG_RTL8192U=m
CONFIG_RTLWIFI=m
# CONFIG_RTS_PSTOR_DEBUG is not set
+# CONFIG_RTS5139_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/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 5521e801237..941e1fd50ef 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -185,6 +185,7 @@ CONFIG_RTC_DRV_TWL4030=m
CONFIG_RTL8192CE=m
CONFIG_RTL8192E=m
CONFIG_RTS_PSTOR=m
+CONFIG_RTS5139=m
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
CONFIG_SATA_SVW=m
CONFIG_SCHEDSTATS=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 1bb25d76184..ec07a4b4e5d 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -173,6 +173,7 @@ CONFIG_RTC_DRV_TWL4030=m
CONFIG_RTL8192CE=m
# CONFIG_RTL8192E is not set
# CONFIG_RTS_PSTOR is not set
+# CONFIG_RTS5139 is not set
CONFIG_SATA_SVW=y
# CONFIG_SCANLOG is not set
CONFIG_SCSI_ACARD=m
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index ea89eed1298..f9046254f1d 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -205,6 +205,7 @@ CONFIG_RTC_DRV_TWL4030=m
CONFIG_RTL8192CE=m
# CONFIG_RTL8192E is not set
# CONFIG_RTS_PSTOR is not set
+# CONFIG_RTS5139 is not set
CONFIG_SATA_SVW=y
CONFIG_SCANLOG=y
CONFIG_SCHEDSTATS=y