diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-22 14:19:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-22 14:19:46 -0400 |
| commit | 2fe83b3ad12d43799af5f3156886eca443a88bac (patch) | |
| tree | 1f09c2f0013f4742106f7b1732da6fdc45b18d39 /drivers/usb | |
| parent | dd6ccfe64dad4ea498392805b477308abef43a4c (diff) | |
| parent | ce8c47cf88af4da2ff429933c07f203a55d5d0a1 (diff) | |
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
leds: cr_bllcd.c: build fix
backlight: Convert from struct class_device to struct device
backlight: Fix order of Kconfig entries
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/misc/appledisplay.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c index b09c83568c1a..1cb56f2d5c84 100644 --- a/drivers/usb/misc/appledisplay.c +++ b/drivers/usb/misc/appledisplay.c | |||
| @@ -138,7 +138,7 @@ exit: | |||
| 138 | 138 | ||
| 139 | static int appledisplay_bl_update_status(struct backlight_device *bd) | 139 | static int appledisplay_bl_update_status(struct backlight_device *bd) |
| 140 | { | 140 | { |
| 141 | struct appledisplay *pdata = class_get_devdata(&bd->class_dev); | 141 | struct appledisplay *pdata = bl_get_data(bd); |
| 142 | int retval; | 142 | int retval; |
| 143 | 143 | ||
| 144 | pdata->msgdata[0] = 0x10; | 144 | pdata->msgdata[0] = 0x10; |
| @@ -159,7 +159,7 @@ static int appledisplay_bl_update_status(struct backlight_device *bd) | |||
| 159 | 159 | ||
| 160 | static int appledisplay_bl_get_brightness(struct backlight_device *bd) | 160 | static int appledisplay_bl_get_brightness(struct backlight_device *bd) |
| 161 | { | 161 | { |
| 162 | struct appledisplay *pdata = class_get_devdata(&bd->class_dev); | 162 | struct appledisplay *pdata = bl_get_data(bd); |
| 163 | int retval; | 163 | int retval; |
| 164 | 164 | ||
| 165 | retval = usb_control_msg( | 165 | retval = usb_control_msg( |