projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ath9k: add support for registering extra leds connected to the wmac gpio lines
[openwrt.git]
/
package
/
mac80211
/
patches
/
100-disable_pcmcia_compat.patch
diff --git
a/package/mac80211/patches/100-disable_pcmcia_compat.patch
b/package/mac80211/patches/100-disable_pcmcia_compat.patch
index
8b366ff
..
fb5ae7d
100644
(file)
--- a/
package/mac80211/patches/100-disable_pcmcia_compat.patch
+++ b/
package/mac80211/patches/100-disable_pcmcia_compat.patch
@@
-1,6
+1,6
@@
--- a/compat/compat-2.6.28.c
+++ b/compat/compat-2.6.28.c
--- a/compat/compat-2.6.28.c
+++ b/compat/compat-2.6.28.c
-@@ -8
7,7 +87
,7 @@ EXPORT_SYMBOL_GPL(usb_poison_urb);
+@@ -8
6,7 +86
,7 @@ EXPORT_SYMBOL_GPL(usb_poison_urb);
#endif
#endif /* CONFIG_USB */
#endif
#endif /* CONFIG_USB */
@@
-11,8
+11,8
@@
struct pcmcia_cfg_mem {
--- a/compat/compat-2.6.33.c
+++ b/compat/compat-2.6.33.c
struct pcmcia_cfg_mem {
--- a/compat/compat-2.6.33.c
+++ b/compat/compat-2.6.33.c
-@@ -1
4,7 +14
,7 @@
-
+@@ -1
1,7 +11
,7 @@
+ #include <linux/compat.h>
#include <linux/autoconf.h>
-#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
#include <linux/autoconf.h>
-#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
@@
-20,7
+20,7
@@
/**
* pccard_loop_tuple() - loop over tuples in the CIS
/**
* pccard_loop_tuple() - loop over tuples in the CIS
-@@ -7
6,7 +76
,7 @@ next_entry:
+@@ -7
3,7 +73
,7 @@ next_entry:
EXPORT_SYMBOL(pccard_loop_tuple);
/* Source: drivers/pcmcia/cistpl.c */
EXPORT_SYMBOL(pccard_loop_tuple);
/* Source: drivers/pcmcia/cistpl.c */
@@
-42,18
+42,16
@@
#include <pcmcia/cs.h>
--- a/include/linux/compat-2.6.33.h
+++ b/include/linux/compat-2.6.33.h
#include <pcmcia/cs.h>
--- a/include/linux/compat-2.6.33.h
+++ b/include/linux/compat-2.6.33.h
-@@ -6,8 +6,8 @@
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33))
+@@ -7,7 +7,7 @@
#include <linux/skbuff.h>
#include <linux/skbuff.h>
+ #include <linux/pci.h>
-#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
-#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
--#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
-+#if 0
+#if 0
#include <pcmcia/cs_types.h>
#include <pcmcia/cistpl.h>
#include <pcmcia/ds.h>
+#if 0
#include <pcmcia/cs_types.h>
#include <pcmcia/cistpl.h>
#include <pcmcia/ds.h>
-@@ -
67,9 +67
,9 @@ static inline struct sk_buff *netdev_all
+@@ -
74,9 +74
,9 @@ static inline struct sk_buff *netdev_all
return skb;
}
return skb;
}
This page took
0.02503 seconds
and
4
git commands to generate.