LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [2.6 patch] net/tokenring/olympic.c section fixes
@ 2008-03-30 22:40 Adrian Bunk
2008-04-04 5:45 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Adrian Bunk @ 2008-03-30 22:40 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, linux-kernel
My previous section fix only turned one section problem into another
section problem.
This patch fixes it for real.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
---
drivers/net/tokenring/olympic.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
59aa404d6b07f60a839e06f3dc772c9de63f5eea diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
index 433c994..df2bbd7 100644
--- a/drivers/net/tokenring/olympic.c
+++ b/drivers/net/tokenring/olympic.c
@@ -117,7 +117,7 @@
* Official releases will only have an a.b.c version number format.
*/
-static char version[] __devinitdata =
+static char version[] =
"Olympic.c v1.0.5 6/04/02 - Peter De Schrijver & Mike Phillips" ;
static char *open_maj_error[] = {"No error", "Lobe Media Test", "Physical Insertion",
@@ -290,7 +290,7 @@ op_disable_dev:
return i;
}
-static int __devinit olympic_init(struct net_device *dev)
+static int olympic_init(struct net_device *dev)
{
struct olympic_private *olympic_priv;
u8 __iomem *olympic_mmio, *init_srb,*adapter_addr;
@@ -434,7 +434,7 @@ static int __devinit olympic_init(struct net_device *dev)
}
-static int __devinit olympic_open(struct net_device *dev)
+static int olympic_open(struct net_device *dev)
{
struct olympic_private *olympic_priv=netdev_priv(dev);
u8 __iomem *olympic_mmio=olympic_priv->olympic_mmio,*init_srb;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [2.6 patch] net/tokenring/olympic.c section fixes
2008-03-30 22:40 [2.6 patch] net/tokenring/olympic.c section fixes Adrian Bunk
@ 2008-04-04 5:45 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2008-04-04 5:45 UTC (permalink / raw)
To: Adrian Bunk; +Cc: netdev, linux-kernel
Adrian Bunk wrote:
> My previous section fix only turned one section problem into another
> section problem.
>
> This patch fixes it for real.
>
> Signed-off-by: Adrian Bunk <bunk@kernel.org>
>
> ---
>
> drivers/net/tokenring/olympic.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> 59aa404d6b07f60a839e06f3dc772c9de63f5eea diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
> index 433c994..df2bbd7 100644
> --- a/drivers/net/tokenring/olympic.c
> +++ b/drivers/net/tokenring/olympic.c
> @@ -117,7 +117,7 @@
> * Official releases will only have an a.b.c version number format.
> */
>
> -static char version[] __devinitdata =
> +static char version[] =
> "Olympic.c v1.0.5 6/04/02 - Peter De Schrijver & Mike Phillips" ;
>
> static char *open_maj_error[] = {"No error", "Lobe Media Test", "Physical Insertion",
> @@ -290,7 +290,7 @@ op_disable_dev:
> return i;
> }
>
> -static int __devinit olympic_init(struct net_device *dev)
> +static int olympic_init(struct net_device *dev)
> {
> struct olympic_private *olympic_priv;
> u8 __iomem *olympic_mmio, *init_srb,*adapter_addr;
> @@ -434,7 +434,7 @@ static int __devinit olympic_init(struct net_device *dev)
>
> }
>
> -static int __devinit olympic_open(struct net_device *dev)
> +static int olympic_open(struct net_device *dev)
> {
> struct olympic_private *olympic_priv=netdev_priv(dev);
> u8 __iomem *olympic_mmio=olympic_priv->olympic_mmio,*init_srb;
applied
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-04-04 5:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-03-30 22:40 [2.6 patch] net/tokenring/olympic.c section fixes Adrian Bunk
2008-04-04 5:45 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).