diff options
| author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 20:11:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-05 14:04:42 -0400 |
| commit | c477ebd89db4f53b380b6ba70d25e055e0aa2739 (patch) | |
| tree | 263acb6c824a8c357ef8baecc72f6fc845e5d17a /drivers/net/can/vcan.c | |
| parent | 6cfe1093ca8ddfc0e50748d370c268aeabf371aa (diff) | |
sections: fix section conflicts in drivers/net
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/can/vcan.c')
| -rw-r--r-- | drivers/net/can/vcan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c index 4f93c0be0053..0a2a5ee79a17 100644 --- a/drivers/net/can/vcan.c +++ b/drivers/net/can/vcan.c | |||
| @@ -49,7 +49,7 @@ | |||
| 49 | #include <linux/slab.h> | 49 | #include <linux/slab.h> |
| 50 | #include <net/rtnetlink.h> | 50 | #include <net/rtnetlink.h> |
| 51 | 51 | ||
| 52 | static __initdata const char banner[] = | 52 | static __initconst const char banner[] = |
| 53 | KERN_INFO "vcan: Virtual CAN interface driver\n"; | 53 | KERN_INFO "vcan: Virtual CAN interface driver\n"; |
| 54 | 54 | ||
| 55 | MODULE_DESCRIPTION("virtual CAN interface"); | 55 | MODULE_DESCRIPTION("virtual CAN interface"); |