diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-12 19:38:56 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-12 19:39:04 (GMT) |
| commit | f46a6804135795f77d096ab0128f27531c7d051c (patch) | |
| tree | 7cd33f69e3661327739ae4c96e5a8389e7fc912e /arch/tile/include/asm/poll.h | |
| parent | b3e84ffa21f916e3354a12a7f19169c9febe96d0 (diff) | |
| parent | ad41a1e0cab07c5125456e8d38e5b1ab148d04aa (diff) | |
| download | linux-f46a6804135795f77d096ab0128f27531c7d051c.tar.xz | |
Merge branch 'linus' into perf/urgent
Merge reason: Fix upstream breakage introduced by:
de5d9bf: Move list types from <linux/list.h> to <linux/types.h>.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/tile/include/asm/poll.h')
| -rw-r--r-- | arch/tile/include/asm/poll.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/tile/include/asm/poll.h b/arch/tile/include/asm/poll.h new file mode 100644 index 0000000..c98509d --- /dev/null +++ b/arch/tile/include/asm/poll.h @@ -0,0 +1 @@ +#include <asm-generic/poll.h> |