diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 18:54:49 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 18:54:49 +0300 |
| commit | d1a76187a5be4f89c6cb19d800cb5fb7aac735c5 (patch) | |
| tree | 2fac3ffbfffc7560eeef8364b541d0d7a0057920 /arch/sparc/oprofile/init.c | |
| parent | c7e78cff6b7518212247fb20b1dc6411540dc9af (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
| download | linux-d1a76187a5be4f89c6cb19d800cb5fb7aac735c5.tar.xz | |
Merge commit 'v2.6.28-rc2' into core/locking
Conflicts:
arch/um/include/asm/system.h
Diffstat (limited to 'arch/sparc/oprofile/init.c')
| -rw-r--r-- | arch/sparc/oprofile/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/oprofile/init.c b/arch/sparc/oprofile/init.c index 9ab815b95b5a..17bb6035069b 100644 --- a/arch/sparc/oprofile/init.c +++ b/arch/sparc/oprofile/init.c @@ -12,7 +12,7 @@ #include <linux/errno.h> #include <linux/init.h> -int __init oprofile_arch_init(struct oprofile_operations * ops) +int __init oprofile_arch_init(struct oprofile_operations *ops) { return -ENODEV; } |