Commit 757498c6 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller

sparc: drop CONFIG_SUN_AUXIO

It is always equals y so no need to test for it
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c2e27c35
...@@ -465,10 +465,6 @@ config SBUSCHAR ...@@ -465,10 +465,6 @@ config SBUSCHAR
bool bool
default y default y
config SUN_AUXIO
bool
default y
config SUN_IO config SUN_IO
bool bool
default y default y
......
...@@ -133,14 +133,12 @@ void __init device_scan(void) ...@@ -133,14 +133,12 @@ void __init device_scan(void)
#endif /* !CONFIG_SMP */ #endif /* !CONFIG_SMP */
cpu_probe(); cpu_probe();
#ifdef CONFIG_SUN_AUXIO
{ {
extern void auxio_probe(void); extern void auxio_probe(void);
extern void auxio_power_probe(void); extern void auxio_power_probe(void);
auxio_probe(); auxio_probe();
auxio_power_probe(); auxio_power_probe();
} }
#endif
clock_stop_probe(); clock_stop_probe();
if (ARCH_SUN4C) if (ARCH_SUN4C)
......
...@@ -168,11 +168,9 @@ void machine_restart(char * cmd) ...@@ -168,11 +168,9 @@ void machine_restart(char * cmd)
void machine_power_off(void) void machine_power_off(void)
{ {
#ifdef CONFIG_SUN_AUXIO
if (auxio_power_register && if (auxio_power_register &&
(strcmp(of_console_device->type, "serial") || scons_pwroff)) (strcmp(of_console_device->type, "serial") || scons_pwroff))
*auxio_power_register |= AUXIO_POWER_OFF; *auxio_power_register |= AUXIO_POWER_OFF;
#endif
machine_halt(); machine_halt();
} }
......
...@@ -122,10 +122,8 @@ EXPORT_SYMBOL(phys_cpu_present_map); ...@@ -122,10 +122,8 @@ EXPORT_SYMBOL(phys_cpu_present_map);
EXPORT_SYMBOL(__udelay); EXPORT_SYMBOL(__udelay);
EXPORT_SYMBOL(__ndelay); EXPORT_SYMBOL(__ndelay);
EXPORT_SYMBOL(rtc_lock); EXPORT_SYMBOL(rtc_lock);
#ifdef CONFIG_SUN_AUXIO
EXPORT_SYMBOL(set_auxio); EXPORT_SYMBOL(set_auxio);
EXPORT_SYMBOL(get_auxio); EXPORT_SYMBOL(get_auxio);
#endif
EXPORT_SYMBOL(io_remap_pfn_range); EXPORT_SYMBOL(io_remap_pfn_range);
#ifndef CONFIG_SMP #ifndef CONFIG_SMP
......
...@@ -154,10 +154,8 @@ EXPORT_SYMBOL(sun4v_niagara_setperf); ...@@ -154,10 +154,8 @@ EXPORT_SYMBOL(sun4v_niagara_setperf);
EXPORT_SYMBOL(sun4v_niagara2_getperf); EXPORT_SYMBOL(sun4v_niagara2_getperf);
EXPORT_SYMBOL(sun4v_niagara2_setperf); EXPORT_SYMBOL(sun4v_niagara2_setperf);
#ifdef CONFIG_SUN_AUXIO
EXPORT_SYMBOL(auxio_set_led); EXPORT_SYMBOL(auxio_set_led);
EXPORT_SYMBOL(auxio_set_lte); EXPORT_SYMBOL(auxio_set_lte);
#endif
#ifdef CONFIG_SBUS #ifdef CONFIG_SBUS
EXPORT_SYMBOL(sbus_set_sbus64); EXPORT_SYMBOL(sbus_set_sbus64);
#endif #endif
......
...@@ -240,9 +240,7 @@ void sun4c_complete_all_stores(void) ...@@ -240,9 +240,7 @@ void sun4c_complete_all_stores(void)
_unused = sun4c_get_context(); _unused = sun4c_get_context();
sun4c_set_context(_unused); sun4c_set_context(_unused);
#ifdef CONFIG_SUN_AUXIO
_unused = get_auxio(); _unused = get_auxio();
#endif
} }
/* Bootup utility functions. */ /* Bootup utility functions. */
......
...@@ -61,9 +61,7 @@ prom_cmdline(void) ...@@ -61,9 +61,7 @@ prom_cmdline(void)
restore_current(); restore_current();
install_linux_ticker(); install_linux_ticker();
spin_unlock_irqrestore(&prom_lock, flags); spin_unlock_irqrestore(&prom_lock, flags);
#ifdef CONFIG_SUN_AUXIO
set_auxio(AUXIO_LED, 0); set_auxio(AUXIO_LED, 0);
#endif
} }
/* Drop into the prom, but completely terminate the program. /* Drop into the prom, but completely terminate the program.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment