Merge commit 'v2.6.28-rc2' into topic/asoc

[karo-tx-linux.git] / include / linux / of_gpio.h

diff --git a/include/linux/of_gpio.h b/include/linux/of_gpio.h
index 2ee97e9877a7c40d1b0fba2b6f3e7ff88bcb686d..67db101d0eb83be9321f08498732c16f42057edc 100644 (file)
--- a/include/linux/of_gpio.h
+++ b/include/linux/of_gpio.h
@@ -15,7 +15,7 @@
 #define __LINUX_OF_GPIO_H
 
 #include <linux/errno.h>
-#include <asm/gpio.h>
+#include <linux/gpio.h>
 
 #ifdef CONFIG_OF_GPIO