summaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/apc.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-06-30 07:23:59 +0200
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-06-30 07:23:59 +0200
commit6da49a292534d31ca391928ea97f8225774dc1e0 (patch)
tree060c5f5f40dceb10d4528763bc7fc1ccc88210d9 /arch/sparc/kernel/apc.c
parentpowerpc/pseries: Move hvsi support into a library (diff)
parentMerge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/air... (diff)
downloadlinux-6da49a292534d31ca391928ea97f8225774dc1e0.tar.xz
linux-6da49a292534d31ca391928ea97f8225774dc1e0.zip
Merge remote branch 'origin/master' into next
Diffstat (limited to 'arch/sparc/kernel/apc.c')
-rw-r--r--arch/sparc/kernel/apc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/apc.c b/arch/sparc/kernel/apc.c
index 1e34f29e58bb..caef9deb5866 100644
--- a/arch/sparc/kernel/apc.c
+++ b/arch/sparc/kernel/apc.c
@@ -123,7 +123,7 @@ static long apc_ioctl(struct file *f, unsigned int cmd, unsigned long __arg)
default:
return -EINVAL;
- };
+ }
return 0;
}