Merge http://gkernel.bkbits.net/alpha-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

arch/alpha/kernel/irq_impl.h

@@ -10,6 +10,7 @@
 
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/profile.h>
 
 
 #define RTC_IRQ    8

include/asm-alpha/poll.h

 #ifndef __ALPHA_POLL_H
 #define __ALPHA_POLL_H
 
-#define POLLIN		1
-#define POLLPRI		2
-#define POLLOUT		4
-#define POLLERR		8
-#define POLLHUP		16
-#define POLLNVAL	32
-#define POLLRDNORM	64
-#define POLLRDBAND	128
-#define POLLWRNORM	256
-#define POLLWRBAND	512
-#define POLLMSG		1024
+#define POLLIN		(1 << 0)
+#define POLLPRI		(1 << 1)
+#define POLLOUT		(1 << 2)
+#define POLLERR		(1 << 3)
+#define POLLHUP		(1 << 4)
+#define POLLNVAL	(1 << 5)
+#define POLLRDNORM	(1 << 6)
+#define POLLRDBAND	(1 << 7)
+#define POLLWRNORM	(1 << 8)
+#define POLLWRBAND	(1 << 9)
+#define POLLMSG		(1 << 10)
+#define POLLREMOVE	(1 << 11)
 
 struct pollfd {
 	int fd;