diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-17 17:46:41 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-21 09:27:18 -0500 |
| commit | ff80aa57cc9946d3dafe65119d576b3d11304303 (patch) | |
| tree | 63c51d7e3515ecd1b92411d49be1104b107a7dc9 /drivers/pcmcia | |
| parent | 11990b2b28dc6785c53c95b2a8f1d8605602a233 (diff) | |
PCMCIA: sa1111: rename sa1111 socket drivers to have sa1111_ prefix.
Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/Makefile | 8 | ||||
| -rw-r--r-- | drivers/pcmcia/sa1111_badge4.c (renamed from drivers/pcmcia/sa1100_badge4.c) | 0 | ||||
| -rw-r--r-- | drivers/pcmcia/sa1111_jornada720.c (renamed from drivers/pcmcia/sa1100_jornada720.c) | 0 | ||||
| -rw-r--r-- | drivers/pcmcia/sa1111_lubbock.c (renamed from drivers/pcmcia/pxa2xx_lubbock.c) | 0 | ||||
| -rw-r--r-- | drivers/pcmcia/sa1111_neponset.c (renamed from drivers/pcmcia/sa1100_neponset.c) | 0 |
5 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index 49d79f707cfc..47525de6a631 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile | |||
| @@ -40,10 +40,10 @@ obj-$(CONFIG_ELECTRA_CF) += electra_cf.o | |||
| 40 | obj-$(CONFIG_PCMCIA_ALCHEMY_DEVBOARD) += db1xxx_ss.o | 40 | obj-$(CONFIG_PCMCIA_ALCHEMY_DEVBOARD) += db1xxx_ss.o |
| 41 | 41 | ||
| 42 | sa1111_cs-y += sa1111_generic.o | 42 | sa1111_cs-y += sa1111_generic.o |
| 43 | sa1111_cs-$(CONFIG_ASSABET_NEPONSET) += sa1100_neponset.o | 43 | sa1111_cs-$(CONFIG_ASSABET_NEPONSET) += sa1111_neponset.o |
| 44 | sa1111_cs-$(CONFIG_SA1100_BADGE4) += sa1100_badge4.o | 44 | sa1111_cs-$(CONFIG_SA1100_BADGE4) += sa1111_badge4.o |
| 45 | sa1111_cs-$(CONFIG_SA1100_JORNADA720) += sa1100_jornada720.o | 45 | sa1111_cs-$(CONFIG_SA1100_JORNADA720) += sa1111_jornada720.o |
| 46 | sa1111_cs-$(CONFIG_ARCH_LUBBOCK) += pxa2xx_lubbock.o | 46 | sa1111_cs-$(CONFIG_ARCH_LUBBOCK) += sa1111_lubbock.o |
| 47 | 47 | ||
| 48 | sa1100_cs-y += sa1100_generic.o | 48 | sa1100_cs-y += sa1100_generic.o |
| 49 | sa1100_cs-$(CONFIG_SA1100_ASSABET) += sa1100_assabet.o | 49 | sa1100_cs-$(CONFIG_SA1100_ASSABET) += sa1100_assabet.o |
diff --git a/drivers/pcmcia/sa1100_badge4.c b/drivers/pcmcia/sa1111_badge4.c index 4d206f4dd67b..4d206f4dd67b 100644 --- a/drivers/pcmcia/sa1100_badge4.c +++ b/drivers/pcmcia/sa1111_badge4.c | |||
diff --git a/drivers/pcmcia/sa1100_jornada720.c b/drivers/pcmcia/sa1111_jornada720.c index 69428d1f5ae1..69428d1f5ae1 100644 --- a/drivers/pcmcia/sa1100_jornada720.c +++ b/drivers/pcmcia/sa1111_jornada720.c | |||
diff --git a/drivers/pcmcia/pxa2xx_lubbock.c b/drivers/pcmcia/sa1111_lubbock.c index c5caf5790451..c5caf5790451 100644 --- a/drivers/pcmcia/pxa2xx_lubbock.c +++ b/drivers/pcmcia/sa1111_lubbock.c | |||
diff --git a/drivers/pcmcia/sa1100_neponset.c b/drivers/pcmcia/sa1111_neponset.c index 50f297d850e7..50f297d850e7 100644 --- a/drivers/pcmcia/sa1100_neponset.c +++ b/drivers/pcmcia/sa1111_neponset.c | |||