1 files changed, 3 insertions, 18 deletions
diff --git a/arch/blackfin/include/asm/poll.h b/arch/blackfin/include/asm/poll.h
index 94cc2636e0e..a0556671357 100644
--- a/arch/blackfin/include/asm/poll.h
+++ b/arch/blackfin/include/asm/poll.h
@@ -1,24 +1,9 @@
 #ifndef __BFIN_POLL_H
 #define __BFIN_POLL_H
-#define POLLIN            1
+#define POLLWRNORM      4 /* POLLOUT */
-#define POLLPRI           2
-#define POLLOUT           4
-#define POLLERR           8
-#define POLLHUP          16
-#define POLLNVAL         32
-#define POLLRDNORM       64
-#define POLLWRNORM      POLLOUT
-#define POLLRDBAND      128
 #define POLLWRBAND      256
-#define POLLMSG         0x0400
-#define POLLREMOVE      0x1000
-#define POLLRDHUP       0x2000
-struct pollfd {
+#include <asm-generic/poll.h>
-        int fd;
-        short events;
-        short revents;
-};
-#endif                          /* __BFIN_POLL_H */
+#endif

diff --git a/arch/blackfin/include/asm/poll.h b/arch/blackfin/include/asm/poll.h index 94cc2636e0e..a0556671357 100644 --- a/arch/blackfin/include/asm/poll.h +++ b/arch/blackfin/include/asm/poll.h
@@ -1,24 +1,9 @@
1	#ifndef __BFIN_POLL_H	1	#ifndef __BFIN_POLL_H
2	#define __BFIN_POLL_H	2	#define __BFIN_POLL_H
3		3
4	#define POLLIN 1	4	#define POLLWRNORM 4 /* POLLOUT */
5	#define POLLPRI 2
6	#define POLLOUT 4
7	#define POLLERR 8
8	#define POLLHUP 16
9	#define POLLNVAL 32
10	#define POLLRDNORM 64
11	#define POLLWRNORM POLLOUT
12	#define POLLRDBAND 128
13	#define POLLWRBAND 256	5	#define POLLWRBAND 256
14	#define POLLMSG 0x0400
15	#define POLLREMOVE 0x1000
16	#define POLLRDHUP 0x2000
17		6
18	struct pollfd {	7	#include <asm-generic/poll.h>
19	int fd;
20	short events;
21	short revents;
22	};
23		8
24	#endif /* __BFIN_POLL_H */	9	#endif