diff options
author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-01-28 20:52:40 +0100 |
---|---|---|
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-01-28 20:52:40 +0100 |
commit | b20f86625de738658c74f2ecfe4050416d2252cc (patch) | |
tree | b84216b70bd923409217834a953f983700e39eda /arch/m68k/emu/nfeth.c | |
parent | atmel_lcdfb: fix usage of CONTRAST_CTR in suspend/resume (diff) | |
parent | Linux 3.3-rc1 (diff) | |
download | linux-b20f86625de738658c74f2ecfe4050416d2252cc.tar.xz linux-b20f86625de738658c74f2ecfe4050416d2252cc.zip |
Merge commit 'v3.3-rc1' into fbdev-next
Diffstat (limited to 'arch/m68k/emu/nfeth.c')
-rw-r--r-- | arch/m68k/emu/nfeth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/emu/nfeth.c b/arch/m68k/emu/nfeth.c index c5748bb4ea71..a985a7e87d45 100644 --- a/arch/m68k/emu/nfeth.c +++ b/arch/m68k/emu/nfeth.c @@ -39,7 +39,7 @@ enum { #define MAX_UNIT 8 /* These identify the driver base version and may not be removed. */ -static const char version[] __devinitdata = +static const char version[] __devinitconst = KERN_INFO KBUILD_MODNAME ".c:v" DRV_VERSION " " DRV_RELDATE " S.Opichal, M.Jurik, P.Stehlik\n" KERN_INFO " http://aranym.org/\n"; |