diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-08 14:56:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-08 14:56:41 -0700 |
| commit | 4dd565134ece7e5d528d4c5288879310c54419e9 (patch) | |
| tree | e08910d2d0feae0c030f8f01acc9b03eb760ad9a /include/asm-x86/uaccess_64.h | |
| parent | 071d7ab6649eb34a873a53e71635186e9117101d (diff) | |
| parent | 69849375d6b13e94d08cdc94b49b11fbab454a0e (diff) | |
| download | blackbird-op-linux-4dd565134ece7e5d528d4c5288879310c54419e9.tar.gz blackbird-op-linux-4dd565134ece7e5d528d4c5288879310c54419e9.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/netdev.c
Diffstat (limited to 'include/asm-x86/uaccess_64.h')
| -rw-r--r-- | include/asm-x86/uaccess_64.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86/uaccess_64.h b/include/asm-x86/uaccess_64.h index 515d4dce96b5..45806d60bcbe 100644 --- a/include/asm-x86/uaccess_64.h +++ b/include/asm-x86/uaccess_64.h @@ -7,6 +7,7 @@ #include <linux/compiler.h> #include <linux/errno.h> #include <linux/prefetch.h> +#include <linux/lockdep.h> #include <asm/page.h> /* |
