diff --git a/[refs] b/[refs]
index 2449b1e56bd6..0cc40950b7b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d08d5d77a355510c2f5657c86b0a4b25acfe72c
+refs/heads/master: 94117cb8db3b6377ae5d68edd724211e9a607326
diff --git a/trunk/arch/arm/mach-nomadik/include/mach/gpio.h b/trunk/arch/arm/mach-nomadik/include/mach/gpio.h
index 7a81a0420343..efdde0ae0a4f 100644
--- a/trunk/arch/arm/mach-nomadik/include/mach/gpio.h
+++ b/trunk/arch/arm/mach-nomadik/include/mach/gpio.h
@@ -1,6 +1,4 @@
 #ifndef __ASM_ARCH_GPIO_H
 #define __ASM_ARCH_GPIO_H
 
-#include <plat/gpio.h>
-
 #endif /* __ASM_ARCH_GPIO_H */
diff --git a/trunk/arch/arm/mach-ux500/include/mach/gpio.h b/trunk/arch/arm/mach-ux500/include/mach/gpio.h
index 3c4cd31ad9f7..7389df911b1a 100644
--- a/trunk/arch/arm/mach-ux500/include/mach/gpio.h
+++ b/trunk/arch/arm/mach-ux500/include/mach/gpio.h
@@ -7,6 +7,4 @@
  */
 #define ARCH_NR_GPIOS	350
 
-#include <plat/gpio.h>
-
 #endif /* __ASM_ARCH_GPIO_H */
diff --git a/trunk/arch/arm/plat-nomadik/include/plat/gpio.h b/trunk/arch/arm/plat-nomadik/include/plat/gpio.h
deleted file mode 100644
index 78c0c0fbadb7..000000000000
--- a/trunk/arch/arm/plat-nomadik/include/plat/gpio.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Structures and registers for GPIO access in the Nomadik SoC
- *
- * Copyright (C) 2008 STMicroelectronics
- *     Author: Prafulla WADASKAR <prafulla.wadaskar@st.com>
- * Copyright (C) 2009 Alessandro Rubini <rubini@unipv.it>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASM_PLAT_GPIO_H
-#define __ASM_PLAT_GPIO_H
-
-#include <linux/kernel.h>
-
-#endif /* __ASM_PLAT_GPIO_H */