projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bbe24fe) | patch
platform-driver-x86: fix wrong merge for compal-laptop.c
authorAxel Lin <axel.lin@gmail.com>
Mon, 14 Mar 2011 10:53:14 +0000 (18:53 +0800)
committerMatthew Garrett <mjg@redhat.com>
Mon, 28 Mar 2011 10:46:03 +0000 (06:46 -0400)
commit0e4510f7c9708304104c07e87b7e5e78fb1716d1
tree9f0bae40a430f2174b0d6927e0e3f8c887975103tree | snapshot
parentbbe24fee22fa045a07ff7e926589ac722c7ee78dcommit | diff
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>
drivers/platform/x86/compal-laptop.c diff | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git