summaryrefslogtreecommitdiffstats
path: root/target/linux/pxa/patches/006-define_smsc911x_for_pcmcia.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2010-02-09 00:11:50 +0000
committerImre Kaloz <kaloz@openwrt.org>2010-02-09 00:11:50 +0000
commit40ba15806fcd52982135c367f49a8ac3ce85913f (patch)
tree09f98f7bcc5053c972d2be6bb9192a79a40d7fdb /target/linux/pxa/patches/006-define_smsc911x_for_pcmcia.patch
parent7c8f9f56301c4d6a6e3bcfc89e407dc5289f5b42 (diff)
downloadmaster-31e0f0ae-40ba15806fcd52982135c367f49a8ac3ce85913f.tar.gz
master-31e0f0ae-40ba15806fcd52982135c367f49a8ac3ce85913f.tar.bz2
master-31e0f0ae-40ba15806fcd52982135c367f49a8ac3ce85913f.zip
upgrade to 2.6.32.7, switch to squashfs, remove broken flag
SVN-Revision: 19562
Diffstat (limited to 'target/linux/pxa/patches/006-define_smsc911x_for_pcmcia.patch')
-rw-r--r--target/linux/pxa/patches/006-define_smsc911x_for_pcmcia.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/pxa/patches/006-define_smsc911x_for_pcmcia.patch b/target/linux/pxa/patches/006-define_smsc911x_for_pcmcia.patch
new file mode 100644
index 0000000000..fe039ae62a
--- /dev/null
+++ b/target/linux/pxa/patches/006-define_smsc911x_for_pcmcia.patch
@@ -0,0 +1,37 @@
+From ddd30dbf3cfd805b0de99fc581d0fa1cc7236ef9 Mon Sep 17 00:00:00 2001
+From: Bobby Powers <bobbypowers@gmail.com>
+Date: Fri, 13 Nov 2009 01:33:05 -0500
+Subject: [PATCH] pxa: define smsc911x structures for pcmcia too
+
+The gumstix pcmcia support (which the wireless driver uses) needs
+to know about the smsc911x platform device even if smsc811x support
+is disabled, as they share resources.
+
+Signed-off-by: Bobby Powers <bobbypowers@gmail.com>
+---
+ arch/arm/mach-pxa/gumstix-verdex.c | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+--- a/arch/arm/mach-pxa/gumstix-verdex.c
++++ b/arch/arm/mach-pxa/gumstix-verdex.c
+@@ -51,7 +51,9 @@
+
+ #include <linux/delay.h>
+
+-#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
++
++#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) \
++ || defined(CONFIG_PCMCIA_PXA2XX) || defined(CONFIG_PCMCIA_PXA2XX_MODULE)
+
+ #include <linux/smsc911x.h>
+
+@@ -85,7 +87,9 @@ static struct platform_device verdex_sms
+ .platform_data = &verdex_smsc911x_config,
+ },
+ };
++#endif
+
++#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
+ static void __init verdex_init_smsc911x(void)
+ {
+