From: Luis R. Rodriguez <mcgrof@frijolero.org>
Date: Tue, 29 May 2012 19:50:42 +0000 (-0700)
Subject: compat-wireless: fix patches/24-pcmcia.patch for next-20120524
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=86596a46269e9b317ef3ee92f21453320d855018;p=openwrt%2Fstaging%2Fblogic.git

compat-wireless: fix patches/24-pcmcia.patch for next-20120524

Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
---

diff --git a/patches/24-pcmcia.patch b/patches/24-pcmcia.patch
index 0d07aa71a38e..a2bc8423d79e 100644
--- a/patches/24-pcmcia.patch
+++ b/patches/24-pcmcia.patch
@@ -29,14 +29,14 @@
  	}
  
  	do {
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
- 		register unsigned int iobase = info->p_dev->resource[0]->start;
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+ 		unsigned int iobase = info->p_dev->resource[0]->start;
 +#else
-+		register unsigned int iobase = info->p_dev->io.BasePort1;
++		unsigned int iobase = info->p_dev->io.BasePort1;
 +#endif
- 		register unsigned int offset;
- 		register unsigned char command;
- 		register unsigned long ready_bit;
+ 		unsigned int offset;
+ 		unsigned char command;
+ 		unsigned long ready_bit;
 @@ -378,7 +391,11 @@ static void bluecard_receive(bluecard_in
  		return;
  	}
@@ -196,12 +196,12 @@
  
  	do {
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
- 		register unsigned int iobase = info->p_dev->resource[0]->start;
+ 		unsigned int iobase = info->p_dev->resource[0]->start;
 +#else
-+		register unsigned int iobase = info->p_dev->io.BasePort1;
++		unsigned int iobase = info->p_dev->io.BasePort1;
 +#endif
  		register struct sk_buff *skb;
- 		register int len;
+ 		int len;
  
 @@ -224,7 +228,11 @@ static void bt3c_receive(bt3c_info_t *in
  		return;
@@ -376,12 +376,12 @@
  
  	do {
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
- 		register unsigned int iobase = info->p_dev->resource[0]->start;
+ 		unsigned int iobase = info->p_dev->resource[0]->start;
 +#else
-+		register unsigned int iobase = info->p_dev->io.BasePort1;
++		unsigned int iobase = info->p_dev->io.BasePort1;
 +#endif
  		register struct sk_buff *skb;
- 		register int len;
+ 		int len;
  
 @@ -181,7 +185,11 @@ static void btuart_receive(btuart_info_t
  		return;
@@ -580,9 +580,9 @@
  
  	do {
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
- 		register unsigned int iobase = info->p_dev->resource[0]->start;
+ 		unsigned int iobase = info->p_dev->resource[0]->start;
 +#else
-+		register unsigned int iobase = info->p_dev->io.BasePort1;
++		unsigned int iobase = info->p_dev->io.BasePort1;
 +#endif
  		register struct sk_buff *skb;
  		register int len;