diff --git a/[refs] b/[refs]
index 4170ae82b18e..432e78c14359 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b34821a601ea079184efba2f9c7c7af61241bde
+refs/heads/master: b6156b4e2e3b725ae3549882f59c82ab5b5048a5
diff --git a/trunk/drivers/serial/Makefile b/trunk/drivers/serial/Makefile
index 927faee0362e..e49808ab4b02 100644
--- a/trunk/drivers/serial/Makefile
+++ b/trunk/drivers/serial/Makefile
@@ -54,5 +54,5 @@ obj-$(CONFIG_SERIAL_TXX9) += serial_txx9.o
 obj-$(CONFIG_SERIAL_VR41XX) += vr41xx_siu.o
 obj-$(CONFIG_SERIAL_SGI_IOC4) += ioc4_serial.o
 obj-$(CONFIG_SERIAL_SGI_IOC3) += ioc3_serial.o
-obj-$(CONFIG_SERIAL_AT91) += at91_serial.o
+obj-$(CONFIG_SERIAL_AT91) += atmel_serial.o
 obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
diff --git a/trunk/drivers/serial/at91_serial.c b/trunk/drivers/serial/atmel_serial.c
similarity index 100%
rename from trunk/drivers/serial/at91_serial.c
rename to trunk/drivers/serial/atmel_serial.c