diff options
| author | Will Deacon <will.deacon@arm.com> | 2014-07-31 14:00:03 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2014-07-31 14:00:03 +0100 |
| commit | 94156675847c14a9b16e91b035da32e35e98ef79 (patch) | |
| tree | b25d54657b0281f36b6585e9d52b9ab063e8405f /arch/arm64/kernel/setup.c | |
| parent | e4aa297a490e16c44dc464361daab145a7c451c5 (diff) | |
| download | linux-94156675847c14a9b16e91b035da32e35e98ef79.tar.gz linux-94156675847c14a9b16e91b035da32e35e98ef79.tar.bz2 linux-94156675847c14a9b16e91b035da32e35e98ef79.zip | |
Revert "arm64: dmi: Add SMBIOS/DMI support"
This reverts commit a28e3f4b90543f7c249a956e3ca518e243a04618.
Ard and Yi Li report that this patch is broken by design, so revert it
and let them sort it out for 3.18 instead.
Reported-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel/setup.c')
| -rw-r--r-- | arch/arm64/kernel/setup.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 35339a0e1592..f6f0ccf35ae6 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -43,7 +43,6 @@ #include <linux/of_fdt.h> #include <linux/of_platform.h> #include <linux/efi.h> -#include <linux/dmi.h> #include <asm/fixmap.h> #include <asm/cpu.h> @@ -414,7 +413,6 @@ void __init setup_arch(char **cmdline_p) static int __init arm64_device_init(void) { of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); - dmi_scan_machine(); return 0; } arch_initcall_sync(arm64_device_init); |