Merge branches 'x86/cache', 'x86/debug' and 'x86/irq' into x86/urgent

[karo-tx-linux.git] / drivers / atm / he.c

diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index 31b513a23ae0cd1d39af043408deba0bbb8c9b83..3617659b918482f4ebeca9b9da10d5e393e963d8 100644 (file)
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -71,7 +71,7 @@
 #include <linux/slab.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #include <linux/atmdev.h>
 #include <linux/atm.h>