From 079b4f68246ed9947330c6116325dbf060dd7ad2 Mon Sep 17 00:00:00 2001 From: Russell King Date: Tue, 17 Jan 2012 22:46:41 +0000 Subject: [PATCH] --- yaml --- r: 295412 b: refs/heads/master c: ff80aa57cc9946d3dafe65119d576b3d11304303 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/Makefile | 8 ++++---- trunk/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 .../pcmcia/{sa1100_neponset.c => sa1111_neponset.c} | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename trunk/drivers/pcmcia/{sa1100_badge4.c => sa1111_badge4.c} (100%) rename trunk/drivers/pcmcia/{sa1100_jornada720.c => sa1111_jornada720.c} (100%) rename trunk/drivers/pcmcia/{pxa2xx_lubbock.c => sa1111_lubbock.c} (100%) rename trunk/drivers/pcmcia/{sa1100_neponset.c => sa1111_neponset.c} (100%) diff --git a/[refs] b/[refs] index a3cd5f08ea50..53ef4e09094c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11990b2b28dc6785c53c95b2a8f1d8605602a233 +refs/heads/master: ff80aa57cc9946d3dafe65119d576b3d11304303 diff --git a/trunk/drivers/pcmcia/Makefile b/trunk/drivers/pcmcia/Makefile index 49d79f707cfc..47525de6a631 100644 --- a/trunk/drivers/pcmcia/Makefile +++ b/trunk/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/trunk/drivers/pcmcia/sa1100_badge4.c b/trunk/drivers/pcmcia/sa1111_badge4.c similarity index 100% rename from trunk/drivers/pcmcia/sa1100_badge4.c rename to trunk/drivers/pcmcia/sa1111_badge4.c diff --git a/trunk/drivers/pcmcia/sa1100_jornada720.c b/trunk/drivers/pcmcia/sa1111_jornada720.c similarity index 100% rename from trunk/drivers/pcmcia/sa1100_jornada720.c rename to trunk/drivers/pcmcia/sa1111_jornada720.c diff --git a/trunk/drivers/pcmcia/pxa2xx_lubbock.c b/trunk/drivers/pcmcia/sa1111_lubbock.c similarity index 100% rename from trunk/drivers/pcmcia/pxa2xx_lubbock.c rename to trunk/drivers/pcmcia/sa1111_lubbock.c diff --git a/trunk/drivers/pcmcia/sa1100_neponset.c b/trunk/drivers/pcmcia/sa1111_neponset.c similarity index 100% rename from trunk/drivers/pcmcia/sa1100_neponset.c rename to trunk/drivers/pcmcia/sa1111_neponset.c