---

yaml --- r: 295412 b: refs/heads/master c: ff80aa5 h: refs/heads/master v: v3
git-mirror · Feb 21, 2012 · 079b4f6 · 079b4f6
1 parent 42217a6
commit 079b4f6
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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 → trunk/drivers/pcmcia/sa1111_badge4.c b/trunk/drivers/pcmcia/sa1100_badge4.c → trunk/drivers/pcmcia/sa1111_badge4.c
diff --git a/trunk/drivers/pcmcia/sa1100_jornada720.c → trunk/drivers/pcmcia/sa1111_jornada720.c b/trunk/drivers/pcmcia/sa1100_jornada720.c → trunk/drivers/pcmcia/sa1111_jornada720.c
diff --git a/trunk/drivers/pcmcia/pxa2xx_lubbock.c → trunk/drivers/pcmcia/sa1111_lubbock.c b/trunk/drivers/pcmcia/pxa2xx_lubbock.c → trunk/drivers/pcmcia/sa1111_lubbock.c
diff --git a/trunk/drivers/pcmcia/sa1100_neponset.c → trunk/drivers/pcmcia/sa1111_neponset.c b/trunk/drivers/pcmcia/sa1100_neponset.c → trunk/drivers/pcmcia/sa1111_neponset.c