]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
sparc: Merge asm-sparc{,64}/poll.h
authorSam Ravnborg <sam@ravnborg.org>
Thu, 5 Jun 2008 21:08:51 +0000 (23:08 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Jul 2008 04:41:24 +0000 (21:41 -0700)
commit62e612f0abb33c99c55ea3d04626f6799a1cdca9
tree34b259d0aae4e639838f2e43d92f0110ffa888a8
parent4835bd988e58150c0a6e2d3e13e319a56ed821dc
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>
include/asm-sparc64/poll.h