Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc

[mv-sheeva.git] / net / atm / addr.c

diff --git a/net/atm/addr.c b/net/atm/addr.c
index 82e85abc303dde8ba0ff278d252c9ea4fd95a43b..dcda35c66f152015d99e916e4c869637c2ecd08a 100644 (file)
--- a/net/atm/addr.c
+++ b/net/atm/addr.c
@@ -4,7 +4,8 @@
 
 #include <linux/atm.h>
 #include <linux/atmdev.h>
-#include <asm/uaccess.h>
+#include <linux/slab.h>
+#include <linux/uaccess.h>
 
 #include "signaling.h"
 #include "addr.h"