Patch against kernel-adaptation-mrst-2.6.37.6-9.2.
(Assume
linux-2.6.36-psb_intel_lvds-add-support-for-mm-to-fix-i2c-adap-num.patch
is applied.)

Pickup linux-2.6.37-gma600-dmicheck.patch from
kernel-adaptation-oaktrail.
Merge psb_intel_lvds-add-support-for-mm-to-fix-i2c-adap-num-v2.patch to
fix typo and remove unused callback.

Reported-and-tested-by: Jeff Cheng <[email protected]>
Signed-off-by: Major Lee <[email protected]>
---
 psb_intel_lvds.c |   23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

--- linux-2.6.37.bak/drivers/staging/mrst/drv/psb_intel_lvds.c
2011-05-03 11:20:32.751690806 +0800
+++ linux-2.6.37/drivers/staging/mrst/drv/psb_intel_lvds.c
2011-05-03 11:36:27.468750000 +0800
@@ -1229,26 +1229,31 @@ mrst_lvds_get_configuration_mode(struct 
        return mode;
 }
 
-static int __init psb_lvds_i2c_adap_callback(const struct dmi_system_id
*id)
-{
-       DRM_DEBUG_KMS("This is an Intel platform of %s\n", id->ident);
-       return 1;
-}
-
 static const struct dmi_system_id psb_lvds_i2c_adap_table[] = {
        {
-               .callback = psb_lvds_i2c_adap_callback,
-               .ident = "Intel OakTrail",
+               .ident = "Intel OakTrail F",
                .matches = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "OakTrail
platform"),
                },
                .driver_data = (void *)1,
        },
        {
-               .callback = psb_lvds_i2c_adap_callback,
+               .ident = "Intel OakTrail G",
+               .matches = {
+                       DMI_MATCH(DMI_PRODUCT_NAME, "OakTrail"),
+               },
+               .driver_data = (void *)1,
+       },
+       {
                .ident = "Intel Moorestown",
                .matches = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "MM"),
+               },
+               .driver_data = (void *)0,
+       },
+       {
+               .ident = "Intel Moorestown",
+               .matches = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "MM 10"),
                },
                .driver_data = (void *)0,

Attachment: psb_intel_lvds-add-support-for-mm-to-fix-i2c-adap-num-v3.patch
Description: psb_intel_lvds-add-support-for-mm-to-fix-i2c-adap-num-v3.patch

_______________________________________________
MeeGo-kernel mailing list
[email protected]
http://lists.meego.com/listinfo/meego-kernel

Reply via email to