From ff80aa57cc9946d3dafe65119d576b3d11304303 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 17 Jan 2012 22:46:41 +0000
Subject: [PATCH] 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>
---
drivers/pcmcia/Makefile | 8 ++++----
drivers/pcmcia/{sa1100_badge4.c => sa1111_badge4.c} | 0
.../pcmcia/{sa1100_jornada720.c => sa1111_jornada720.c} | 0
drivers/pcmcia/{pxa2xx_lubbock.c => sa1111_lubbock.c} | 0
drivers/pcmcia/{sa1100_neponset.c => sa1111_neponset.c} | 0
5 files changed, 4 insertions(+), 4 deletions(-)
rename drivers/pcmcia/{sa1100_badge4.c => sa1111_badge4.c} (100%)
rename drivers/pcmcia/{sa1100_jornada720.c => sa1111_jornada720.c} (100%)
rename drivers/pcmcia/{pxa2xx_lubbock.c => sa1111_lubbock.c} (100%)
rename drivers/pcmcia/{sa1100_neponset.c => sa1111_neponset.c} (100%)
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
obj-$(CONFIG_PCMCIA_ALCHEMY_DEVBOARD) += db1xxx_ss.o
sa1111_cs-y += sa1111_generic.o
-sa1111_cs-$(CONFIG_ASSABET_NEPONSET) += sa1100_neponset.o
-sa1111_cs-$(CONFIG_SA1100_BADGE4) += sa1100_badge4.o
-sa1111_cs-$(CONFIG_SA1100_JORNADA720) += sa1100_jornada720.o
-sa1111_cs-$(CONFIG_ARCH_LUBBOCK) += pxa2xx_lubbock.o
+sa1111_cs-$(CONFIG_ASSABET_NEPONSET) += sa1111_neponset.o
+sa1111_cs-$(CONFIG_SA1100_BADGE4) += sa1111_badge4.o
+sa1111_cs-$(CONFIG_SA1100_JORNADA720) += sa1111_jornada720.o
+sa1111_cs-$(CONFIG_ARCH_LUBBOCK) += sa1111_lubbock.o
sa1100_cs-y += sa1100_generic.o
sa1100_cs-$(CONFIG_SA1100_ASSABET) += sa1100_assabet.o
diff --git a/drivers/pcmcia/sa1100_badge4.c b/drivers/pcmcia/sa1111_badge4.c
similarity index 100%
rename from drivers/pcmcia/sa1100_badge4.c
rename to drivers/pcmcia/sa1111_badge4.c
diff --git a/drivers/pcmcia/sa1100_jornada720.c b/drivers/pcmcia/sa1111_jornada720.c
similarity index 100%
rename from drivers/pcmcia/sa1100_jornada720.c
rename to drivers/pcmcia/sa1111_jornada720.c
diff --git a/drivers/pcmcia/pxa2xx_lubbock.c b/drivers/pcmcia/sa1111_lubbock.c
similarity index 100%
rename from drivers/pcmcia/pxa2xx_lubbock.c
rename to drivers/pcmcia/sa1111_lubbock.c
diff --git a/drivers/pcmcia/sa1100_neponset.c b/drivers/pcmcia/sa1111_neponset.c
similarity index 100%
rename from drivers/pcmcia/sa1100_neponset.c
rename to drivers/pcmcia/sa1111_neponset.c
--
2.20.1