Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[linux-2.6-omap-h63xx.git] / arch / parisc / oprofile / init.c

diff --git a/arch/parisc/oprofile/init.c b/arch/parisc/oprofile/init.c
index a5b898c4d0b02bc0b2b3417f51361d2050353d10..026cba2af07ad1672eb97b4dae44942971da13b0 100644 (file)
--- a/arch/parisc/oprofile/init.c
+++ b/arch/parisc/oprofile/init.c
@@ -12,12 +12,12 @@
 #include <linux/kernel.h>
 #include <linux/oprofile.h>
 
-int __init oprofile_arch_init(struct oprofile_operations * ops)
+int __init oprofile_arch_init(struct oprofile_operations *ops)
 {
        return -ENODEV;
 }
 
 
-void oprofile_arch_exit()
+void oprofile_arch_exit(void)
 {
 }