Commit 62e612f0 authored Jun 05, 2008 by Sam Ravnborg Committed by David S. Miller Jul 17, 2008

sparc: Merge asm-sparc{,64}/poll.h



:$ diff -u include/asm-sparc/poll.h include/asm-sparc64/poll.h
:-- include/asm-sparc/poll.h	2008-06-13 06:42:07.000000000 +0200
:++ include/asm-sparc64/poll.h	2008-06-13 06:42:07.000000000 +0200
:@@ -1,5 +1,5 @@
:-#ifndef __SPARC_POLL_H
:-#define __SPARC_POLL_H
:+#ifndef __SPARC64_POLL_H
:+#define __SPARC64_POLL_H
:
: #define POLLWRNORM	POLLOUT
: #define POLLWRBAND	256

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

parent 4835bd98

include/asm-sparc64/poll.h

+1 −12

Original line number	Diff line number	Diff line
		#ifndef __SPARC64_POLL_H
		#define __SPARC64_POLL_H

		#define POLLWRNORM POLLOUT
		#define POLLWRBAND 256
		#define POLLMSG 512
		#define POLLREMOVE 1024
		#define POLLRDHUP 2048

		#include <asm-generic/poll.h>

		#endif
		#include <asm-sparc/poll.h>

Admin message