diff --git a/[refs] b/[refs] index 099443a54a59..fb786a530232 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f20b20de73eeabe3d35e67e0ce993eceef07492 +refs/heads/master: 72c57ed50663dc04b0b329beaec39b557c8ac5a5 diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c index fe4713347275..eda6162c58f2 100644 --- a/trunk/kernel/sysctl.c +++ b/trunk/kernel/sysctl.c @@ -118,7 +118,7 @@ extern char modprobe_path[]; extern int sg_big_buff; #endif -#ifdef __sparc__ +#ifdef CONFIG_SPARC extern char reboot_command []; extern int stop_a_enabled; extern int scons_pwroff; @@ -414,7 +414,7 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = &proc_dointvec, }, -#ifdef __sparc__ +#ifdef CONFIG_SPARC { .ctl_name = KERN_SPARC_REBOOT, .procname = "reboot-cmd",