diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-29 18:23:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-29 18:23:30 -0800 |
| commit | cac9283ca3dc7f4404b4034c6f06a3076c033b04 (patch) | |
| tree | e419dceb86e30877f0ad04847201a5f99680ba96 /arch/x86/platform/intel-mid/mrfl.c | |
| parent | cca21640d217f2a421ef63e7045381dc2b9a8afc (diff) | |
| parent | 790ed7421a973d9773dda8b4e5300c3f7f6fbcf7 (diff) | |
Merge branch 'x86-intel-mid-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull intel MID cleanups from Peter Anvin:
"Miscellaneous cleanups to the intel-mid code merged earlier in this
merge window"
* 'x86-intel-mid-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, intel-mid: Cleanup some platform code's header files
x86, intel-mid: Add missing 'void' to functions without arguments
x86: Don't add new __cpuinit users to Merrifield platform code
x86: Don't introduce more __cpuinit users in intel_mid_weak_decls.h
Diffstat (limited to 'arch/x86/platform/intel-mid/mrfl.c')
| -rw-r--r-- | arch/x86/platform/intel-mid/mrfl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c index 09d10159e7b7..aaca91753d32 100644 --- a/arch/x86/platform/intel-mid/mrfl.c +++ b/arch/x86/platform/intel-mid/mrfl.c @@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = { .arch_setup = tangier_arch_setup, }; -void * __cpuinit get_tangier_ops() +void *get_tangier_ops(void) { return &tangier_ops; } |