Merge branch 'merge' into powerpc-next
[linux-2.6] / include / asm-sh / poll.h
1 #include <asm-generic/poll.h>