git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4835bd9)
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)
:$ 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 patch | blob | history

diff --cc include/asm-sparc64/poll.h
Simple merge
Pandora Kernel Repository