Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / misc / sti / sti-netlink.c

diff --git a/drivers/misc/sti/sti-netlink.c b/drivers/misc/sti/sti-netlink.c
index ca3533e75190b67c82888516895cc4517efe255e..f1f8a48f4aa3cce73d135a9e57943ddf61725dca 100644 (file)
--- a/drivers/misc/sti/sti-netlink.c
+++ b/drivers/misc/sti/sti-netlink.c
@@ -15,7 +15,7 @@
 #include <linux/skbuff.h>
 #include <linux/mutex.h>
 #include <net/sock.h>
-#include <asm/arch/sti.h>
+#include <mach/sti.h>
 
 static struct sock *sti_sock;
 static DEFINE_MUTEX(sti_netlink_mutex);