Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux

* 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux:
  hmt: adjust for new pwm_backlight->notify prototype
This commit is contained in:
Linus Torvalds 2010-01-21 17:33:23 -08:00
commit 298a4c3a57

View File

@ -82,7 +82,7 @@ static int hmt_bl_init(struct device *dev)
return ret;
}
static int hmt_bl_notify(int brightness)
static int hmt_bl_notify(struct device *dev, int brightness)
{
/*
* translate from CIELUV/CIELAB L*->brightness, E.G. from