Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
[sfrench/cifs-2.6.git] / net / bridge / br_netfilter_hooks.c
index 135cc8ab813c16bc2e513e0bf81c5da26082553a..95087e6e8258366af95579bb308d1a6e18266f0e 100644 (file)
@@ -40,7 +40,7 @@
 #include <net/netfilter/br_netfilter.h>
 #include <net/netns/generic.h>
 
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include "br_private.h"
 #ifdef CONFIG_SYSCTL
 #include <linux/sysctl.h>