The patch titled
x86: Fix dmi detection of MacBookPro and iMac
has been added to the -mm tree. Its filename is
x86-fix-dmi-detection-of-macbookpro-and-imac.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: x86: Fix dmi detection of MacBookPro and iMac
From: Thomas Meyer <thomas@xxxxxxxx>
This commit:
http://kernel.org/git/?p=linux/kernel/git/gregkh/linux-2.6.git;a=commit;h=b64ef8afa58f397e1eaba2bd9ecaa6812064d464
contained a wrong DMI_MATCH.
Signed-off-by: Thomas Meyer <thomas@xxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/video/imacfb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/video/imacfb.c~x86-fix-dmi-detection-of-macbookpro-and-imac drivers/video/imacfb.c
--- a/drivers/video/imacfb.c~x86-fix-dmi-detection-of-macbookpro-and-imac
+++ a/drivers/video/imacfb.c
@@ -71,10 +71,10 @@ static int set_system(struct dmi_system_
static struct dmi_system_id __initdata dmi_system_table[] = {
{ set_system, "iMac4,1", {
DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
- DMI_MATCH(DMI_BIOS_VERSION,"iMac4,1") }, (void*)M_I17},
+ DMI_MATCH(DMI_PRODUCT_NAME,"iMac4,1") }, (void*)M_I17},
{ set_system, "MacBookPro1,1", {
DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
- DMI_MATCH(DMI_BIOS_VERSION,"MacBookPro1,1") }, (void*)M_I17},
+ DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro1,1") }, (void*)M_I17},
{ set_system, "MacBook1,1", {
DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
DMI_MATCH(DMI_PRODUCT_NAME,"MacBook1,1")}, (void *)M_MACBOOK},
_
Patches currently in -mm which might be from thomas@xxxxxxxx are
x86-fix-dmi-detection-of-macbookpro-and-imac.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
