diff options
| author | Pierre Ossman <drzeus@drzeus.cx> | 2008-12-31 13:56:05 -0500 |
|---|---|---|
| committer | Pierre Ossman <drzeus@drzeus.cx> | 2008-12-31 13:56:05 -0500 |
| commit | 418f19ea17a99421b22a64e101e14b6a16bed66d (patch) | |
| tree | 7c21fcc368c63f1f9907deac6d16b30bd371792d /kernel/profile.c | |
| parent | 98444d3dd975653a4a970ecc0dfc30918da92f60 (diff) | |
| parent | f6e10b865c3ea56bdaa8c6ecfee313b997900dbb (diff) | |
Merge branch 'master' of ../mmc
Diffstat (limited to 'kernel/profile.c')
| -rw-r--r-- | kernel/profile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/profile.c b/kernel/profile.c index dc41827fbfee..60adefb59b5e 100644 --- a/kernel/profile.c +++ b/kernel/profile.c | |||
| @@ -544,7 +544,7 @@ static const struct file_operations proc_profile_operations = { | |||
| 544 | }; | 544 | }; |
| 545 | 545 | ||
| 546 | #ifdef CONFIG_SMP | 546 | #ifdef CONFIG_SMP |
| 547 | static inline void profile_nop(void *unused) | 547 | static void profile_nop(void *unused) |
| 548 | { | 548 | { |
| 549 | } | 549 | } |
| 550 | 550 | ||