summaryrefslogtreecommitdiff
path: root/include/asm-cris/poll.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-01 19:51:51 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-01 19:51:51 +0300
commit0242909a6135e10a28822c64f9ad50fdad52757c (patch)
treec5f9c8abe95a65433e6ac356871f2379c02488fe /include/asm-cris/poll.h
parent0a6d2fac615972142715d736289abeeb7382e81d (diff)
parent556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3 (diff)
downloadlinux-0242909a6135e10a28822c64f9ad50fdad52757c.tar.xz
Merge branch 'cris_move' of git://www.jni.nu/cris
* 'cris_move' of git://www.jni.nu/cris: [CRIS] Move header files from include to arch/cris/include. [CRISv32] Remove warning in io.h
Diffstat (limited to 'include/asm-cris/poll.h')
-rw-r--r--include/asm-cris/poll.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-cris/poll.h b/include/asm-cris/poll.h
deleted file mode 100644
index c98509d3149e..000000000000
--- a/include/asm-cris/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>