summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorArthur Othieno <a.othieno@bluewin.ch>2005-11-07 00:58:43 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 07:53:30 -0800
commit5f9c3cbcd5d41be597aef9c0ff64ebfc8a91cd6f (patch)
treedff52a6eb5b3cb7e9968240945f06fea02f4251f /include
parent31ab269a0307d8725737dfbbdeb5dcde7b41bc36 (diff)
downloadlinux-3.10-5f9c3cbcd5d41be597aef9c0ff64ebfc8a91cd6f.tar.gz
linux-3.10-5f9c3cbcd5d41be597aef9c0ff64ebfc8a91cd6f.tar.bz2
linux-3.10-5f9c3cbcd5d41be597aef9c0ff64ebfc8a91cd6f.zip
[PATCH] cris: printk() duplicate declaration
printk() already declared in include/linux/kernel.h so squish the duplication. Besides, no printk() usage here. Bye bye. Signed-off-by: Arthur Othieno <a.othieno@bluewin.ch> Cc: Mikael Starvik <starvik@axis.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-cris/semaphore.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-cris/semaphore.h b/include/asm-cris/semaphore.h
index 39faf69bcf7..a19568e6aae 100644
--- a/include/asm-cris/semaphore.h
+++ b/include/asm-cris/semaphore.h
@@ -18,8 +18,6 @@
* CRIS semaphores, implemented in C-only so far.
*/
-int printk(const char *fmt, ...);
-
struct semaphore {
atomic_t count;
atomic_t waking;