From d5c172da01982279e0170aa35f90d6625e1397c6 Mon Sep 17 00:00:00 2001
From: Vernon Mauery <vernux@us.ibm.com>
Date: Tue, 2 Nov 2010 13:08:10 -0700
Subject: [PATCH] --- yaml --- r: 222983 b: refs/heads/master c:
 a2262260f9eaee4acd56b5624b5d2bf4be9bb38a h: refs/heads/master i:   222981:
 bc6dbea613cff72d6361d4a6e5d7cf3db266aa03   222979:
 c43df6577228d133544e88ef0f68942941c9d1dc   222975:
 0f17f934f19c9a088434722a3791eeb4ce314ca8 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/platform/x86/ibm_rtl.c | 29 +++++-----------------------
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/[refs] b/[refs]
index bc8c889179f4..b9f3e52665eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d41014b92d60a6b375aad9b6ebc52201ee58df70
+refs/heads/master: a2262260f9eaee4acd56b5624b5d2bf4be9bb38a
diff --git a/trunk/drivers/platform/x86/ibm_rtl.c b/trunk/drivers/platform/x86/ibm_rtl.c
index a884f5498846..5c975edb3c81 100644
--- a/trunk/drivers/platform/x86/ibm_rtl.c
+++ b/trunk/drivers/platform/x86/ibm_rtl.c
@@ -220,32 +220,13 @@ static void rtl_teardown_sysfs(void) {
 	sysdev_class_unregister(&class_rtl);
 }
 
-static int dmi_check_cb(const struct dmi_system_id *id)
-{
-	RTL_DEBUG("found IBM server '%s'\n", id->ident);
-	return 0;
-}
-
-#define ibm_dmi_entry(NAME, TYPE)                  \
-{                                                  \
-	.ident = NAME,                             \
-	.matches = {                               \
-		DMI_MATCH(DMI_SYS_VENDOR, "IBM"),  \
-		DMI_MATCH(DMI_PRODUCT_NAME, TYPE), \
-	},                                         \
-	.callback = dmi_check_cb                   \
-}
 
 static struct dmi_system_id __initdata ibm_rtl_dmi_table[] = {
-	ibm_dmi_entry("BladeCenter LS21", "7971"),
-	ibm_dmi_entry("BladeCenter LS22", "7901"),
-	ibm_dmi_entry("BladeCenter HS21 XM", "7995"),
-	ibm_dmi_entry("BladeCenter HS22", "7870"),
-	ibm_dmi_entry("BladeCenter HS22V", "7871"),
-	ibm_dmi_entry("System x3550 M2", "7946"),
-	ibm_dmi_entry("System x3650 M2", "7947"),
-	ibm_dmi_entry("System x3550 M3", "7944"),
-	ibm_dmi_entry("System x3650 M3", "7945"),
+	{                                                  \
+		.matches = {                               \
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),  \
+		},                                         \
+	},
 	{ }
 };