diff --git a/[refs] b/[refs]
index 02128f9a8b57..054c1e2c5bb4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 313819d4c25cdd46b42e85d70870b713bb9189ab
+refs/heads/master: 7f61d1e2b77a3c2c222a7ba5c751b63bfd5dbb37
diff --git a/trunk/arch/arm/mach-sa1100/include/mach/SA-1111.h b/trunk/arch/arm/mach-sa1100/include/mach/SA-1111.h
deleted file mode 100644
index c38f60915cb6..000000000000
--- a/trunk/arch/arm/mach-sa1100/include/mach/SA-1111.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * Moved to new location
- */
-#warning using old SA-1111.h - update to <asm/hardware/sa1111.h>
-#include <asm/hardware/sa1111.h>