diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /arch/alpha/kernel/osf_sys.c | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'arch/alpha/kernel/osf_sys.c')
| -rw-r--r-- | arch/alpha/kernel/osf_sys.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index ae41f097864b..42ee05981e71 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c | |||
| @@ -46,8 +46,6 @@ | |||
| 46 | #include <asm/hwrpb.h> | 46 | #include <asm/hwrpb.h> |
| 47 | #include <asm/processor.h> | 47 | #include <asm/processor.h> |
| 48 | 48 | ||
| 49 | extern int do_pipe(int *); | ||
| 50 | |||
| 51 | /* | 49 | /* |
| 52 | * Brk needs to return an error. Still support Linux's brk(0) query idiom, | 50 | * Brk needs to return an error. Still support Linux's brk(0) query idiom, |
| 53 | * which OSF programs just shouldn't be doing. We're still not quite | 51 | * which OSF programs just shouldn't be doing. We're still not quite |