diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/Makefile | 4 | ||||
| -rw-r--r-- | drivers/spi/tegra_spi.c (renamed from drivers/spi/tegra2_spi.c) | 2 | ||||
| -rw-r--r-- | drivers/spi/tegra_spi_new.c (renamed from drivers/spi/tegra2_spi_new.c) | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index b6911c29f6..866a742fd6 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -42,9 +42,9 @@ COBJS-$(CONFIG_SOFT_SPI) += soft_spi.o COBJS-$(CONFIG_SH_SPI) += sh_spi.o COBJS-$(CONFIG_FSL_ESPI) += fsl_espi.o ifdef CONFIG_NEW_SPI_XFER -COBJS-$(CONFIG_TEGRA2_SPI) += tegra2_spi_new.o +COBJS-$(CONFIG_TEGRA_SPI) += tegra_spi_new.o else -COBJS-$(CONFIG_TEGRA2_SPI) += tegra2_spi.o +COBJS-$(CONFIG_TEGRA_SPI) += tegra_spi.o endif COBJS := $(COBJS-y) diff --git a/drivers/spi/tegra2_spi.c b/drivers/spi/tegra_spi.c index 5fcfeeacd8..c69a63915c 100644 --- a/drivers/spi/tegra2_spi.c +++ b/drivers/spi/tegra_spi.c @@ -30,10 +30,10 @@ #include <asm/io.h> #include <asm/arch-tegra/bitfield.h> #include <asm/arch-tegra/clk_rst.h> +#include <asm/arch-tegra/spi.h> #include <asm/arch/clock.h> #include <asm/arch/gpio.h> #include <asm/arch/pinmux.h> -#include <asm/arch/tegra2_spi.h> #include "uart-spi-fix.h" int spi_cs_is_valid(unsigned int bus, unsigned int cs) diff --git a/drivers/spi/tegra2_spi_new.c b/drivers/spi/tegra_spi_new.c index 6f03df27be..6053f143f2 100644 --- a/drivers/spi/tegra2_spi_new.c +++ b/drivers/spi/tegra_spi_new.c @@ -30,10 +30,10 @@ #include <asm/io.h> #include <asm/arch-tegra/bitfield.h> #include <asm/arch-tegra/clk_rst.h> +#include <asm/arch-tegra/spi.h> #include <asm/arch/clock.h> #include <asm/arch/gpio.h> #include <asm/arch/pinmux.h> -#include <asm/arch/tegra2_spi.h> #include "uart-spi-fix.h" int spi_cs_is_valid(unsigned int bus, unsigned int cs) |