diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2008-09-01 12:32:13 +0200 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-09-01 12:32:13 +0200 |
commit | 9d7548d4ca3c52ecb58f098a32b0756cdf8f96ee (patch) | |
tree | 651f7058bbaa2d8b2855286380d614afcf505118 /include/asm-x86/mmconfig.h | |
parent | [JFFS2] Move JFFS2 config options out of fs/Kconfig (diff) | |
parent | Resource handling: add 'insert_resource_expand_to_fit()' function (diff) | |
download | linux-9d7548d4ca3c52ecb58f098a32b0756cdf8f96ee.tar.xz linux-9d7548d4ca3c52ecb58f098a32b0756cdf8f96ee.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-x86/mmconfig.h')
-rw-r--r-- | include/asm-x86/mmconfig.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/mmconfig.h b/include/asm-x86/mmconfig.h index 95beda07c6fa..e293ab81e850 100644 --- a/include/asm-x86/mmconfig.h +++ b/include/asm-x86/mmconfig.h @@ -3,7 +3,7 @@ #ifdef CONFIG_PCI_MMCONFIG extern void __cpuinit fam10h_check_enable_mmcfg(void); -extern void __init check_enable_amd_mmconf_dmi(void); +extern void __cpuinit check_enable_amd_mmconf_dmi(void); #else static inline void fam10h_check_enable_mmcfg(void) { } static inline void check_enable_amd_mmconf_dmi(void) { } |