aboutsummaryrefslogtreecommitdiffstats
path: root/arch/xtensa/include/asm/futex.h
diff options
context:
space:
mode:
authorDavid Vrabel <david.vrabel@csr.com>2009-01-22 19:12:32 +0000
committerDavid Vrabel <david.vrabel@csr.com>2009-01-22 19:12:32 +0000
commitdff243f7cb3a2ebbb09093066c1bc4a90ff5b3a4 (patch)
tree1c63e7c2f879cd322ca785671b74b4ff796dd24c /arch/xtensa/include/asm/futex.h
parenta5e6ced58d423cb09c4fc0087dcfdb0b5deb5e1c (diff)
parentf3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b (diff)
downloadkernel_samsung_smdk4412-dff243f7cb3a2ebbb09093066c1bc4a90ff5b3a4.zip
kernel_samsung_smdk4412-dff243f7cb3a2ebbb09093066c1bc4a90ff5b3a4.tar.gz
kernel_samsung_smdk4412-dff243f7cb3a2ebbb09093066c1bc4a90ff5b3a4.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'arch/xtensa/include/asm/futex.h')
-rw-r--r--arch/xtensa/include/asm/futex.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/xtensa/include/asm/futex.h b/arch/xtensa/include/asm/futex.h
new file mode 100644
index 0000000..0b74582
--- /dev/null
+++ b/arch/xtensa/include/asm/futex.h
@@ -0,0 +1 @@
+#include <asm-generic/futex.h>