diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index 55528c889e..bba1ab8510 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -30,6 +30,7 @@ COBJS-y += pxa_pcmcia.o
 COBJS-y += rpx_pcmcia.o
 COBJS-y += ti_pci1410a.o
 COBJS-y += tqm8xx_pcmcia.o
+COBJS-y += marubun_pcmcia.o
 
 COBJS	:= $(COBJS-y)
 SRCS 	:= $(COBJS:.o=.c)
diff --git a/drivers/marubun_pcmcia.c b/drivers/pcmcia/marubun_pcmcia.c
similarity index 100%
rename from drivers/marubun_pcmcia.c
rename to drivers/pcmcia/marubun_pcmcia.c
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 735c630006..ee2b780857 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -35,6 +35,7 @@ COBJS-y += serial_max3100.o
 COBJS-y += serial_pl010.o
 COBJS-y += serial_pl011.o
 COBJS-y += serial_xuartlite.o
+COBJS-y += serial_sh.o
 COBJS-y += usbtty.o
 
 COBJS	:= $(COBJS-y)
diff --git a/drivers/serial_sh.c b/drivers/serial/serial_sh.c
similarity index 100%
rename from drivers/serial_sh.c
rename to drivers/serial/serial_sh.c