diff options
| author | Linus Walleij <linus.walleij@stericsson.com> | 2011-10-17 13:16:12 +0200 |
|---|---|---|
| committer | Linus WALLEIJ <linus.walleij@stericsson.com> | 2011-10-17 15:17:21 +0200 |
| commit | b73e4046b5703eeccf658bd0ac53625e4fe0ddf9 (patch) | |
| tree | 8b19cafb678fc6e511fb275355ce74f90c2ec558 /drivers/spi | |
| parent | 7643e6771af6dab78420727f56e3422c60e0aa91 (diff) | |
Ugly-rename amba-pl022 to spi-pl022
This ugly renaming of the file amba-pl022 to spi-pl022 is
done in order to be able to apply PL022 patches from the
mainline kernel without hazzle.
Grant reorganized all the drivers but to apply his original
renaming patch we would have to bring in all patches to all
*other* drivers up to that point, which would in turn bring
in a large portion of the kernel 3.1 baseline - let's not
go there.
This is ugly but the alternatives are uglier. When
rebasing to a kernel later than this one, remove this patch
and use mainline commits as far as possible.
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Change-Id: If5a453371f46b09af88febdd03319d1f2fcb612b
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34206
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/Makefile | 2 | ||||
| -rw-r--r-- | drivers/spi/spi-pl022.c (renamed from drivers/spi/amba-pl022.c) | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index d50739d10d5..5009d88e7f0 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -34,7 +34,7 @@ obj-$(CONFIG_SPI_OMAP_UWIRE) += omap_uwire.o obj-$(CONFIG_SPI_OMAP24XX) += omap2_mcspi.o obj-$(CONFIG_SPI_OMAP_100K) += omap_spi_100k.o obj-$(CONFIG_SPI_ORION) += orion_spi.o -obj-$(CONFIG_SPI_PL022) += amba-pl022.o +obj-$(CONFIG_SPI_PL022) += spi-pl022.o obj-$(CONFIG_SPI_MPC512x_PSC) += mpc512x_psc_spi.o obj-$(CONFIG_SPI_MPC52xx_PSC) += mpc52xx_psc_spi.o obj-$(CONFIG_SPI_MPC52xx) += mpc52xx_spi.o diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/spi-pl022.c index d18ce9e946d..b3bd8d89758 100644 --- a/drivers/spi/amba-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -1,6 +1,4 @@ /* - * drivers/spi/amba-pl022.c - * * A driver for the ARM PL022 PrimeCell SSP/SPI bus master. * * Copyright (C) 2008-2009 ST-Ericsson AB |