diff options
| author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 20:11:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-05 14:04:43 -0400 |
| commit | afa8c78b889262a1c809a1c1ed17619015ad0481 (patch) | |
| tree | 8792e3d4961443c11f38f2b110cd12ad59904362 /drivers/net/hamradio/6pack.c | |
| parent | c477ebd89db4f53b380b6ba70d25e055e0aa2739 (diff) | |
sections: fix section conflicts in drivers/net/hamradio
Signed-off-by: Andi Kleen <ak@linux.intel.com>
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/hamradio/6pack.c')
| -rw-r--r-- | drivers/net/hamradio/6pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index d225a2adf1ee..1450e33fc250 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c | |||
| @@ -829,7 +829,7 @@ static int __init sixpack_init_driver(void) | |||
| 829 | return status; | 829 | return status; |
| 830 | } | 830 | } |
| 831 | 831 | ||
| 832 | static const char msg_unregfail[] __exitdata = KERN_ERR \ | 832 | static const char msg_unregfail[] = KERN_ERR \ |
| 833 | "6pack: can't unregister line discipline (err = %d)\n"; | 833 | "6pack: can't unregister line discipline (err = %d)\n"; |
| 834 | 834 | ||
| 835 | static void __exit sixpack_exit_driver(void) | 835 | static void __exit sixpack_exit_driver(void) |