diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-18 11:16:55 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-18 11:16:55 +1000 |
| commit | 4b337c5f245b6587ba844ac7bb13c313a2912f7b (patch) | |
| tree | 999c6a6580b76a083c8efb9dabff709d1c49fcd0 /include/linux/init.h | |
| parent | 492b057c426e4aa747484958e18e9da29003985d (diff) | |
| parent | 3fe0344faf7fdcb158bd5c1a9aec960a8d70c8e8 (diff) | |
| download | kernel-crypto-4b337c5f245b6587ba844ac7bb13c313a2912f7b.tar.gz kernel-crypto-4b337c5f245b6587ba844ac7bb13c313a2912f7b.tar.xz kernel-crypto-4b337c5f245b6587ba844ac7bb13c313a2912f7b.zip | |
Merge commit 'origin/master' into next
Diffstat (limited to 'include/linux/init.h')
| -rw-r--r-- | include/linux/init.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index b2189803f19..8c2c9989626 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -29,7 +29,7 @@ * sign followed by value, e.g.: * * static int init_variable __initdata = 0; - * static char linux_logo[] __initdata = { 0x32, 0x36, ... }; + * static const char linux_logo[] __initconst = { 0x32, 0x36, ... }; * * Don't forget to initialize data not at file scope, i.e. within a function, * as gcc otherwise puts the data into the bss section and not into the init |