Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 298a4c3a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 92dcffb9 1619ce11

arch/arm/mach-s3c6410/mach-hmt.c

+1 −1
Original line number Diff line number Diff line
@@ -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