summaryrefslogtreecommitdiffstats
path: root/arch/sparc/prom/console_64.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2010-03-05 21:46:18 +0100
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-03-05 21:46:18 +0100
commit3fa04ecd72780da31ba8b329e148179bc24a9c7d (patch)
treef5d462fd4aee086952d18f159f737c450ab46b3b /arch/sparc/prom/console_64.c
parentnfs41 fix NFS4ERR_CLID_INUSE for exchange id (diff)
parentNFS: Remove requirement for inode->i_mutex from nfs_invalidate_mapping (diff)
downloadlinux-3fa04ecd72780da31ba8b329e148179bc24a9c7d.tar.xz
linux-3fa04ecd72780da31ba8b329e148179bc24a9c7d.zip
Merge branch 'writeback-for-2.6.34' into nfs-for-2.6.34
Diffstat (limited to 'arch/sparc/prom/console_64.c')
-rw-r--r--arch/sparc/prom/console_64.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/prom/console_64.c b/arch/sparc/prom/console_64.c
index e1c3fc87484d..f55d58a8a156 100644
--- a/arch/sparc/prom/console_64.c
+++ b/arch/sparc/prom/console_64.c
@@ -62,7 +62,6 @@ void
prom_putchar(char c)
{
prom_nbputchar(c);
- return;
}
void