]> git.hungrycats.org Git - linux/commitdiff
backlight: MacBookPro6,2 mbp-nvidia-bl support
authorZygo Blaxell <zblaxell@river.furryterror.org>
Tue, 10 May 2011 16:31:52 +0000 (12:31 -0400)
committerZygo Blaxell <zblaxell@river.furryterror.org>
Tue, 10 May 2011 16:31:52 +0000 (12:31 -0400)
From https://lists.launchpad.net/mactel-support/msg02484.html
(cherry picked from commit a0ac65e128c19ead4b686106a9be6d11bef95a45)

Conflicts:

drivers/video/backlight/mbp_nvidia_bl.c

drivers/video/backlight/mbp_nvidia_bl.c

index 1485f7345f49ee32586d5d665d1bd624cfcd3e1a..01893ea9dfe21ec8320997ce0a8bce25f54cd913 100644 (file)
@@ -353,6 +353,15 @@ static const struct dmi_system_id __initdata mbp_device_table[] = {
                },
                .driver_data    = (void *)&nvidia_chipset_data,
        },
+       {
+               .callback       = mbp_dmi_match,
+               .ident          = "MacBookPro 6,2",
+               .matches        = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro6,2"),
+               },
+               .driver_data    = (void *)&intel_chipset_data,
+       },
        { }
 };