diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index dbc6c3f65892..2d09fbd0f933 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -61,7 +61,7 @@ obj-${CONFIG_MACH_STINGRAY} += board-stingray-wifi.o obj-${CONFIG_MACH_STINGRAY} += board-stingray-sensors.o obj-${CONFIG_MACH_STINGRAY} += board-stingray-wlan_nvs.o obj-${CONFIG_MACH_STINGRAY} += board-stingray-touch.o -obj-${CONFIG_MACH_STINGRAY} += board-stingray-spi.o +obj-${CONFIG_MACH_STINGRAY} += board-stingray-power.o obj-${CONFIG_MACH_STINGRAY} += board-stingray-rfkill.o obj-${CONFIG_MACH_STINGRAY} += board-stingray-gps.o obj-${CONFIG_MACH_STINGRAY} += board-stingray-usbnet.o diff --git a/arch/arm/mach-tegra/board-stingray-spi.c b/arch/arm/mach-tegra/board-stingray-power.c similarity index 99% rename from arch/arm/mach-tegra/board-stingray-spi.c rename to arch/arm/mach-tegra/board-stingray-power.c index 3f4acc6aa984..38304a482720 100644 --- a/arch/arm/mach-tegra/board-stingray-spi.c +++ b/arch/arm/mach-tegra/board-stingray-power.c @@ -600,7 +600,7 @@ static struct spi_board_info stingray_spi_board_info[] __initdata = { }, }; -int __init stingray_spi_init(void) +int __init stingray_power_init(void) { int i; diff --git a/arch/arm/mach-tegra/board-stingray.c b/arch/arm/mach-tegra/board-stingray.c index bf8ed241ce5f..6cf6cff4cc86 100644 --- a/arch/arm/mach-tegra/board-stingray.c +++ b/arch/arm/mach-tegra/board-stingray.c @@ -597,7 +597,7 @@ static void __init tegra_stingray_init(void) stingray_power_off_init(); stingray_keypad_init(); stingray_touch_init(); - stingray_spi_init(); + stingray_power_init(); stingray_panel_init(); stingray_sdhci_init(); stingray_w1_init(); diff --git a/arch/arm/mach-tegra/board-stingray.h b/arch/arm/mach-tegra/board-stingray.h index 666bf71e9afe..a9d41e654483 100644 --- a/arch/arm/mach-tegra/board-stingray.h +++ b/arch/arm/mach-tegra/board-stingray.h @@ -23,7 +23,7 @@ int stingray_keypad_init(void); int stingray_wlan_init(void); int stingray_sensors_init(void); int stingray_touch_init(void); -int stingray_spi_init(void); +int stingray_power_init(void); int stingray_revision(void); void stingray_gps_init(void);