From a70c53467ed0cb0758dd8d7418268db8b55e2ed1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 28 Apr 2008 02:14:14 -0700 Subject: [PATCH] --- yaml --- r: 94096 b: refs/heads/master c: 7ae9392c0a3bc01562361bb21e23dfb2e5c81c5a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/Kconfig | 12 +++++++++--- trunk/include/linux/dmi.h | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b21ffea1b64d..26cc2ad5249b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d83fd8a26769c75d51a6b05d8dcb3e36302dd8ba +refs/heads/master: 7ae9392c0a3bc01562361bb21e23dfb2e5c81c5a diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index a8ce13a54764..a12dbb2b93f3 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -86,9 +86,6 @@ config GENERIC_GPIO config ARCH_MAY_HAVE_PC_FDC def_bool y -config DMI - def_bool y - config RWSEM_GENERIC_SPINLOCK def_bool !X86_XADD @@ -485,6 +482,15 @@ config HPET_EMULATE_RTC # Mark as embedded because too many people got it wrong. # The code disables itself when not needed. +config DMI + default y + bool "Enable DMI scanning" if EMBEDDED + help + Enabled scanning of DMI to identify machine quirks. Say Y + here unless you have verified that your setup is not + affected by entries in the DMI blacklist. Required by PNP + BIOS code. + config GART_IOMMU bool "GART IOMMU support" if EMBEDDED default y diff --git a/trunk/include/linux/dmi.h b/trunk/include/linux/dmi.h index 325acdf5c462..2a063b64133f 100644 --- a/trunk/include/linux/dmi.h +++ b/trunk/include/linux/dmi.h @@ -90,6 +90,7 @@ static inline int dmi_check_system(const struct dmi_system_id *list) { return 0; static inline const char * dmi_get_system_info(int field) { return NULL; } static inline const struct dmi_device * dmi_find_device(int type, const char *name, const struct dmi_device *from) { return NULL; } +static inline void dmi_scan_machine(void) { return; } static inline int dmi_get_year(int year) { return 0; } static inline int dmi_name_in_vendors(const char *s) { return 0; } #define dmi_available 0