aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <benh@debian.org>2012-06-27 02:07:48 +0000
committerBen Hutchings <benh@debian.org>2012-06-27 02:07:48 +0000
commitd18107b6ac57cf0c2d089cc8f9f2b1f6f7c9a08e (patch)
tree45db9992386ff570a90414ee236ee2114bee7c9b
parent0be856837de51a83cac46ed165c4b28aee59fcd4 (diff)
downloadkernel_replicant_linux-d18107b6ac57cf0c2d089cc8f9f2b1f6f7c9a08e.tar.gz
kernel_replicant_linux-d18107b6ac57cf0c2d089cc8f9f2b1f6f7c9a08e.tar.bz2
kernel_replicant_linux-d18107b6ac57cf0c2d089cc8f9f2b1f6f7c9a08e.zip
i2400m: Disable I2400M_SDIO; hardware did not reach production
svn path=/dists/sid/linux/; revision=19219
-rw-r--r--debian/changelog1
-rw-r--r--debian/config/config6
2 files changed, 3 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index ad554ec2a545..22ce7b27989e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ linux (3.2.21-3) UNRELEASED; urgency=low
* driver core: remove __must_check from device_create_file
(fixes FTBFS on sparc)
+ * i2400m: Disable I2400M_SDIO; hardware did not reach production
-- Ben Hutchings <ben@decadent.org.uk> Wed, 27 Jun 2012 02:56:49 +0100
diff --git a/debian/config/config b/debian/config/config
index 2e76052e35e4..2eecadadb241 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1546,8 +1546,7 @@ CONFIG_EEPROM_93CX6=m
##
## file: drivers/misc/iwmc3200top/Kconfig
##
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
+# CONFIG_IWMC3200TOP is not set
##
## file: drivers/misc/lis3lv02d/Kconfig
@@ -2160,8 +2159,7 @@ CONFIG_WAN_ROUTER_DRIVERS=m
## file: drivers/net/wimax/i2400m/Kconfig
##
CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_SDIO=m
-CONFIG_WIMAX_IWMC3200_SDIO=y
+# CONFIG_WIMAX_I2400M_SDIO is not set
CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
##