Merge with Linux 2.4.0-test5-pre4.

1 files changed, 1 insertions, 14 deletions

diff --git a/include/linux/poll.h b/include/linux/poll.h
index 64b5df671..24138dbd2 100644
--- a/include/linux/poll.h
+++ b/include/linux/poll.h
@@ -10,26 +10,13 @@
 #include <linux/mm.h>
 #include <asm/uaccess.h>
 
-
-struct poll_table_entry {
-	struct file * filp;
-	wait_queue_t wait;
-	wait_queue_head_t * wait_address;
-};
-
-struct poll_table_page {
-	struct poll_table_page * next;
-	unsigned int nr;
-	struct poll_table_entry * entry;
-};
+struct poll_table_page;
 
 typedef struct poll_table_struct {
 	int error;
 	struct poll_table_page * table;
 } poll_table;
 
-#define __MAX_POLL_TABLE_ENTRIES ((PAGE_SIZE - sizeof (struct poll_table_page)) / sizeof (struct poll_table_entry))
-
 extern void __pollwait(struct file * filp, wait_queue_head_t * wait_address, poll_table *p);
 
 extern inline void poll_wait(struct file * filp, wait_queue_head_t * wait_address, poll_table *p)