summaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/systbls.h
diff options
context:
space:
mode:
authorGrant Likely2010-01-28 22:38:25 +0100
committerGrant Likely2010-01-28 22:38:25 +0100
commit0ada0a73120c28cc432bcdbac061781465c2f48f (patch)
treed17cadd4ea47e25d9e48e7d409a39c84268fbd27 /arch/sparc/kernel/systbls.h
parentof: unify phandle name in struct device_node (diff)
parentLinux 2.6.33-rc5 (diff)
downloadkernel-qcow2-linux-0ada0a73120c28cc432bcdbac061781465c2f48f.tar.gz
kernel-qcow2-linux-0ada0a73120c28cc432bcdbac061781465c2f48f.tar.xz
kernel-qcow2-linux-0ada0a73120c28cc432bcdbac061781465c2f48f.zip
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
Diffstat (limited to 'arch/sparc/kernel/systbls.h')
-rw-r--r--arch/sparc/kernel/systbls.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/kernel/systbls.h b/arch/sparc/kernel/systbls.h
index a63c5d2d9849..d2f999ae2b85 100644
--- a/arch/sparc/kernel/systbls.h
+++ b/arch/sparc/kernel/systbls.h
@@ -9,7 +9,6 @@
struct new_utsname;
extern asmlinkage unsigned long sys_getpagesize(void);
-extern asmlinkage unsigned long sparc_brk(unsigned long brk);
extern asmlinkage long sparc_pipe(struct pt_regs *regs);
extern asmlinkage long sys_ipc(unsigned int call, int first,
unsigned long second,