Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / net / atm / br2684.c

diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 1dafa9c108a75fdca35792e67e2b5c35ec8ed2ec..680ccb12aae8652d194735c0645c78a040d1f8e9 100644 (file)
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -18,6 +18,7 @@ Author: Marcell GAL, 2000, XDSL Ltd, Hungary
 #include <net/arp.h>
 #include <linux/atm.h>
 #include <linux/atmdev.h>
+#include <linux/capability.h>
 #include <linux/seq_file.h>
 
 #include <linux/atmbr2684.h>