diff options
| author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 20:11:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-05 14:04:43 -0400 |
| commit | 15c0665c2f61d4312255d8952197e5f90a11c1e3 (patch) | |
| tree | 6386847b3d9cc7155ca149d1b909062d450fa34f /drivers/net | |
| parent | afa8c78b889262a1c809a1c1ed17619015ad0481 (diff) | |
sections: fix section conflicts in drivers/net/wan
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Krzysztof Halasa <khc@pm.waw.pl>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wan/z85230.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c index 0e5769061702..feacc3b994b7 100644 --- a/drivers/net/wan/z85230.c +++ b/drivers/net/wan/z85230.c | |||
| @@ -1775,7 +1775,7 @@ EXPORT_SYMBOL(z8530_queue_xmit); | |||
| 1775 | /* | 1775 | /* |
| 1776 | * Module support | 1776 | * Module support |
| 1777 | */ | 1777 | */ |
| 1778 | static const char banner[] __initdata = | 1778 | static const char banner[] __initconst = |
| 1779 | KERN_INFO "Generic Z85C30/Z85230 interface driver v0.02\n"; | 1779 | KERN_INFO "Generic Z85C30/Z85230 interface driver v0.02\n"; |
| 1780 | 1780 | ||
| 1781 | static int __init z85230_init_driver(void) | 1781 | static int __init z85230_init_driver(void) |