From: Axel Lin <axel.lin@gmail.com>
Date: Mon, 14 Mar 2011 10:53:14 +0000 (+0800)
Subject: platform-driver-x86: fix wrong merge for compal-laptop.c
X-Git-Tag: v2.6.39-rc1~20^2^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e4510f7c9708304104c07e87b7e5e78fb1716d1;p=pandora-kernel.git

platform-driver-x86: fix wrong merge for compal-laptop.c

I found the commit 80183a4b
"compal-laptop/fujitsu-laptop/msi-laptop: make dmi_check_cb to return 1 instead of 0"
has wrong patch merge.

The original patch change the return value for dmi_check_cb():
https://lkml.org/lkml/2010/7/2/88
But commit 80183a4b changed the return value for set_backlight_level.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
---

Reading git-diff-tree failed