diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-04 20:15:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-04 20:15:07 -0400 |
| commit | 5941de8eadc287f3f47b87ce9888734ee07d210b (patch) | |
| tree | 2f5a8e84c33ae2df61e4e807798a153d6b7f6fbb /include/asm-s390/poll.h | |
| parent | c44df7413fd711bca818111b94cbd7ce5f3600a9 (diff) | |
| parent | c6557e7f2b6ae76a44653d38f835174074c42e05 (diff) | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] move include/asm-s390 to arch/s390/include/asm
Diffstat (limited to 'include/asm-s390/poll.h')
| -rw-r--r-- | include/asm-s390/poll.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-s390/poll.h b/include/asm-s390/poll.h deleted file mode 100644 index c98509d3149e..000000000000 --- a/include/asm-s390/poll.h +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | #include <asm-generic/poll.h> | ||