diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:45:11 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:45:11 -0400 |
| commit | 846050dd49719b1f68248807bba5c27bfc86f81a (patch) | |
| tree | 79922936e8cde867ba90d753f79aa61f575e162b /drivers/net/tokenring/ibmtr.c | |
| parent | 49666145de54b5d6d256442bb1bec03ffae1ac76 (diff) | |
| parent | 2ca2d5e84c19ddbc0126087af6288533a05f1799 (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/net/tokenring/ibmtr.c')
| -rw-r--r-- | drivers/net/tokenring/ibmtr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c index 9f491563944e..4470025ff7f8 100644 --- a/drivers/net/tokenring/ibmtr.c +++ b/drivers/net/tokenring/ibmtr.c | |||
| @@ -140,7 +140,7 @@ in the event that chatty debug messages are desired - jjs 12/30/98 */ | |||
| 140 | 140 | ||
| 141 | /* version and credits */ | 141 | /* version and credits */ |
| 142 | #ifndef PCMCIA | 142 | #ifndef PCMCIA |
| 143 | static char version[] __initdata = | 143 | static char version[] __devinitdata = |
| 144 | "\nibmtr.c: v1.3.57 8/ 7/94 Peter De Schrijver and Mark Swanson\n" | 144 | "\nibmtr.c: v1.3.57 8/ 7/94 Peter De Schrijver and Mark Swanson\n" |
| 145 | " v2.1.125 10/20/98 Paul Norton <pnorton@ieee.org>\n" | 145 | " v2.1.125 10/20/98 Paul Norton <pnorton@ieee.org>\n" |
| 146 | " v2.2.0 12/30/98 Joel Sloan <jjs@c-me.com>\n" | 146 | " v2.2.0 12/30/98 Joel Sloan <jjs@c-me.com>\n" |
| @@ -216,7 +216,7 @@ static int __devinitdata turbo_irq[IBMTR_MAX_ADAPTERS] = {0}; | |||
| 216 | static int __devinitdata turbo_searched = 0; | 216 | static int __devinitdata turbo_searched = 0; |
| 217 | 217 | ||
| 218 | #ifndef PCMCIA | 218 | #ifndef PCMCIA |
| 219 | static __u32 ibmtr_mem_base __initdata = 0xd0000; | 219 | static __u32 ibmtr_mem_base __devinitdata = 0xd0000; |
| 220 | #endif | 220 | #endif |
| 221 | 221 | ||
| 222 | static void __devinit PrtChanID(char *pcid, short stride) | 222 | static void __devinit PrtChanID(char *pcid, short stride) |