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

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

arch/sparc/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -465,10 +465,6 @@ config SBUSCHAR 
	bool

	default y



config SUN_AUXIO

	bool

	default y



config SUN_IO

	bool

	default y

arch/sparc/kernel/devices.c

+0 −2
Original line number Diff line number Diff line
@@ -133,14 +133,12 @@ void __init device_scan(void) 
#endif /* !CONFIG_SMP */



	cpu_probe();

#ifdef CONFIG_SUN_AUXIO

	{

		extern void auxio_probe(void);

		extern void auxio_power_probe(void);

		auxio_probe();

		auxio_power_probe();

	}

#endif

	clock_stop_probe();



	if (ARCH_SUN4C)

arch/sparc/kernel/process_32.c

+0 −2
Original line number Diff line number Diff line
@@ -168,11 +168,9 @@ void machine_restart(char * cmd) 


void machine_power_off(void)

{

#ifdef CONFIG_SUN_AUXIO

	if (auxio_power_register &&

	    (strcmp(of_console_device->type, "serial") || scons_pwroff))

		*auxio_power_register |= AUXIO_POWER_OFF;

#endif

	machine_halt();

}

arch/sparc/kernel/sparc_ksyms_32.c

+0 −2
Original line number Diff line number Diff line
@@ -122,10 +122,8 @@ EXPORT_SYMBOL(phys_cpu_present_map); 
EXPORT_SYMBOL(__udelay);

EXPORT_SYMBOL(__ndelay);

EXPORT_SYMBOL(rtc_lock);

#ifdef CONFIG_SUN_AUXIO

EXPORT_SYMBOL(set_auxio);

EXPORT_SYMBOL(get_auxio);

#endif

EXPORT_SYMBOL(io_remap_pfn_range);



#ifndef CONFIG_SMP

arch/sparc/kernel/sparc_ksyms_64.c

+0 −2
Original line number Diff line number Diff line
@@ -154,10 +154,8 @@ EXPORT_SYMBOL(sun4v_niagara_setperf); 
EXPORT_SYMBOL(sun4v_niagara2_getperf);

EXPORT_SYMBOL(sun4v_niagara2_setperf);



#ifdef CONFIG_SUN_AUXIO

EXPORT_SYMBOL(auxio_set_led);

EXPORT_SYMBOL(auxio_set_lte);

#endif

#ifdef CONFIG_SBUS

EXPORT_SYMBOL(sbus_set_sbus64);

#endif