diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-07-19 11:28:03 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-07-25 14:41:29 -0600 |
| commit | 2a414b227ce77d0110d35e3a30ec3a4f417a57da (patch) | |
| tree | e584afc92e69086a701245df90434c659ae9a72c /debian.master | |
| parent | ba5fb8a4cdf89c049827d6aa5925fbcc3d38e892 (diff) | |
Revert "UBUNTU: [Config] Temporarily Disable CONFIG_RTL8192SE on arm"
This reverts commit d87061824894fb9ab96906802e2a6d1625d7f771.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'debian.master')
| -rw-r--r-- | debian.master/config/amd64/config.common.amd64 | 1 | ||||
| -rw-r--r-- | debian.master/config/armel/config.common.armel | 1 | ||||
| -rw-r--r-- | debian.master/config/config.common.ubuntu | 1 | ||||
| -rw-r--r-- | debian.master/config/i386/config.common.i386 | 1 | ||||
| -rw-r--r-- | debian.master/config/powerpc/config.common.powerpc | 1 | ||||
| -rw-r--r-- | debian.master/config/ppc64/config.common.ppc64 | 1 |
6 files changed, 1 insertions, 5 deletions
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 8576cf2ef03..8a29e21b171 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -243,7 +243,6 @@ CONFIG_RTC_DRV_TEST=m CONFIG_RTC_DRV_TWL4030=m CONFIG_RTL8192CE=m CONFIG_RTL8192E=m -CONFIG_RTL8192SE=m CONFIG_RTS_PSTOR=m # CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_SATA_SVW=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 67835be8790..ed60e3d4943 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -224,7 +224,6 @@ CONFIG_RTC_DRV_TEST=m CONFIG_RTC_DRV_TWL4030=y # CONFIG_RTL8192CE is not set CONFIG_RTL8192E=m -# CONFIG_RTL8192SE is not set # CONFIG_RTS_PSTOR is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_SATA_SVW=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 931522dad36..67bd3f510b9 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -4091,6 +4091,7 @@ CONFIG_RTL8187=m CONFIG_RTL8187_LEDS=y CONFIG_RTL8192CU=m CONFIG_RTL8192C_COMMON=m +CONFIG_RTL8192SE=m CONFIG_RTL8192U=m CONFIG_RTLWIFI=m # CONFIG_RTS_PSTOR_DEBUG is not set diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 36a62e41a9b..618fafb9fd6 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -242,7 +242,6 @@ CONFIG_RTC_DRV_TEST=m CONFIG_RTC_DRV_TWL4030=m CONFIG_RTL8192CE=m CONFIG_RTL8192E=m -CONFIG_RTL8192SE=m CONFIG_RTS_PSTOR=m # CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_SATA_SVW=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 2981dbbfc1f..21b2368c427 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -229,7 +229,6 @@ CONFIG_RTC_DRV_CMOS=m CONFIG_RTC_DRV_TWL4030=m CONFIG_RTL8192CE=m # CONFIG_RTL8192E is not set -CONFIG_RTL8192SE=m # CONFIG_RTS_PSTOR is not set CONFIG_SATA_SVW=y # CONFIG_SCANLOG is not set diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index c9eb7e8a699..54d92f135ba 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -268,7 +268,6 @@ CONFIG_RTC_DRV_CMOS=m CONFIG_RTC_DRV_TWL4030=m CONFIG_RTL8192CE=m # CONFIG_RTL8192E is not set -CONFIG_RTL8192SE=m # CONFIG_RTS_PSTOR is not set CONFIG_SATA_SVW=y CONFIG_SCANLOG=y |