diff options
Diffstat (limited to 'arch/arm/mach-bcmring')
-rw-r--r-- | arch/arm/mach-bcmring/arch.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-bcmring/arch.c b/arch/arm/mach-bcmring/arch.c index 0da693b0f7e1..fbe6fa02c882 100644 --- a/arch/arm/mach-bcmring/arch.c +++ b/arch/arm/mach-bcmring/arch.c | |||
@@ -47,10 +47,6 @@ HW_DECLARE_SPINLOCK(gpio) | |||
47 | EXPORT_SYMBOL(bcmring_gpio_reg_lock); | 47 | EXPORT_SYMBOL(bcmring_gpio_reg_lock); |
48 | #endif | 48 | #endif |
49 | 49 | ||
50 | /* FIXME: temporary solution */ | ||
51 | #define BCM_SYSCTL_REBOOT_WARM 1 | ||
52 | #define CTL_BCM_REBOOT 112 | ||
53 | |||
54 | /* sysctl */ | 50 | /* sysctl */ |
55 | int bcmring_arch_warm_reboot; /* do a warm reboot on hard reset */ | 51 | int bcmring_arch_warm_reboot; /* do a warm reboot on hard reset */ |
56 | 52 | ||
@@ -58,18 +54,16 @@ static struct ctl_table_header *bcmring_sysctl_header; | |||
58 | 54 | ||
59 | static struct ctl_table bcmring_sysctl_warm_reboot[] = { | 55 | static struct ctl_table bcmring_sysctl_warm_reboot[] = { |
60 | { | 56 | { |
61 | .ctl_name = BCM_SYSCTL_REBOOT_WARM, | ||
62 | .procname = "warm", | 57 | .procname = "warm", |
63 | .data = &bcmring_arch_warm_reboot, | 58 | .data = &bcmring_arch_warm_reboot, |
64 | .maxlen = sizeof(int), | 59 | .maxlen = sizeof(int), |
65 | .mode = 0644, | 60 | .mode = 0644, |
66 | .proc_handler = &proc_dointvec}, | 61 | .proc_handler = proc_dointvec}, |
67 | {} | 62 | {} |
68 | }; | 63 | }; |
69 | 64 | ||
70 | static struct ctl_table bcmring_sysctl_reboot[] = { | 65 | static struct ctl_table bcmring_sysctl_reboot[] = { |
71 | { | 66 | { |
72 | .ctl_name = CTL_BCM_REBOOT, | ||
73 | .procname = "reboot", | 67 | .procname = "reboot", |
74 | .mode = 0555, | 68 | .mode = 0555, |
75 | .child = bcmring_sysctl_warm_reboot}, | 69 | .child = bcmring_sysctl_warm_reboot}, |