Skip to content

Commit

Permalink
sparc: Merge asm-sparc{,64}/poll.h
Browse files Browse the repository at this point in the history
:$ 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>
  • Loading branch information
Sam Ravnborg authored and David S. Miller committed Jul 18, 2008
1 parent 4835bd9 commit 62e612f
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions include/asm-sparc64/poll.h
Original file line number Diff line number Diff line change
@@ -1,12 +1 @@
#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>

0 comments on commit 62e612f

Please sign in to comment.