diff options
author | Al Viro | 2012-11-17 04:27:58 +0100 |
---|---|---|
committer | Al Viro | 2012-11-17 04:27:58 +0100 |
commit | d05f06e60df4f56a70fb8a3e46335b40687169e9 (patch) | |
tree | c1eec6749fed86a21b08606e1e4acefe4b033253 /arch/frv/kernel/setup.c | |
parent | Merge branch 'arch-s390' into no-rebases (diff) | |
parent | frv: fix the broken preempt (diff) | |
download | kernel-qcow2-linux-d05f06e60df4f56a70fb8a3e46335b40687169e9.tar.gz kernel-qcow2-linux-d05f06e60df4f56a70fb8a3e46335b40687169e9.tar.xz kernel-qcow2-linux-d05f06e60df4f56a70fb8a3e46335b40687169e9.zip |
Merge branch 'arch-frv' into no-rebases
Diffstat (limited to 'arch/frv/kernel/setup.c')
-rw-r--r-- | arch/frv/kernel/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c index 1f1e5efb3385..b8993c87d3de 100644 --- a/arch/frv/kernel/setup.c +++ b/arch/frv/kernel/setup.c @@ -112,9 +112,11 @@ char __initdata redboot_command_line[COMMAND_LINE_SIZE]; #ifdef CONFIG_PM #define __pminit #define __pminitdata +#define __pminitconst #else #define __pminit __init #define __pminitdata __initdata +#define __pminitconst __initconst #endif struct clock_cmode { |