From 8829d9dab8c014824a317bbf414c8790ad444ac9 Mon Sep 17 00:00:00 2001
From: Mario Schwalbe <schwalbe@inf.tu-dresden.de>
Date: Mon, 19 Apr 2010 17:59:26 +0100
Subject: [PATCH] --- yaml --- r: 199070 b: refs/heads/master c:
 8193db229101fa5e7e7070422a7471775140e7bd h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/video/backlight/mbp_nvidia_bl.c | 45 +++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 14e5f5b6c4a3..4ecad3ff254d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fdd5767ebe5806f02e1c8d9ac67ac4da8836f53
+refs/heads/master: 8193db229101fa5e7e7070422a7471775140e7bd
diff --git a/trunk/drivers/video/backlight/mbp_nvidia_bl.c b/trunk/drivers/video/backlight/mbp_nvidia_bl.c
index 1b5d3fe6bbbc..52c780f5db1b 100644
--- a/trunk/drivers/video/backlight/mbp_nvidia_bl.c
+++ b/trunk/drivers/video/backlight/mbp_nvidia_bl.c
@@ -182,6 +182,42 @@ static const struct dmi_system_id __initdata mbp_device_table[] = {
 		},
 		.driver_data	= (void *)&intel_chipset_data,
 	},
+	{
+		.callback	= mbp_dmi_match,
+		.ident		= "MacBookPro 1,1",
+		.matches	= {
+			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro1,1"),
+		},
+		.driver_data	= (void *)&intel_chipset_data,
+	},
+	{
+		.callback	= mbp_dmi_match,
+		.ident		= "MacBookPro 1,2",
+		.matches	= {
+			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro1,2"),
+		},
+		.driver_data	= (void *)&intel_chipset_data,
+	},
+	{
+		.callback	= mbp_dmi_match,
+		.ident		= "MacBookPro 2,1",
+		.matches	= {
+			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro2,1"),
+		},
+		.driver_data	= (void *)&intel_chipset_data,
+	},
+	{
+		.callback	= mbp_dmi_match,
+		.ident		= "MacBookPro 2,2",
+		.matches	= {
+			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro2,2"),
+		},
+		.driver_data	= (void *)&intel_chipset_data,
+	},
 	{
 		.callback	= mbp_dmi_match,
 		.ident		= "MacBookPro 3,1",
@@ -236,6 +272,15 @@ static const struct dmi_system_id __initdata mbp_device_table[] = {
 		},
 		.driver_data	= (void *)&nvidia_chipset_data,
 	},
+	{
+		.callback	= mbp_dmi_match,
+		.ident		= "MacBook 6,1",
+		.matches	= {
+			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "MacBook6,1"),
+		},
+		.driver_data	= (void *)&nvidia_chipset_data,
+	},
 	{
 		.callback	= mbp_dmi_match,
 		.ident		= "MacBookAir 2,1",