diff options
| author | Todd Poynor <toddpoynor@google.com> | 2012-04-30 15:45:33 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2012-04-30 15:45:33 -0700 |
| commit | 7a0198f07b75c9564212f039e1fa3956926386a2 (patch) | |
| tree | c5873f225d91947f0edc5a82ad36936c39773ae2 /drivers/media | |
| parent | 03fb8f57c5dd5530c5bcfcd3eabc632456accf75 (diff) | |
| parent | 5c15664a86e18352ccdc2f501907725caa9ab73d (diff) | |
| download | kernel_samsung_tuna-7a0198f07b75c9564212f039e1fa3956926386a2.zip kernel_samsung_tuna-7a0198f07b75c9564212f039e1fa3956926386a2.tar.gz kernel_samsung_tuna-7a0198f07b75c9564212f039e1fa3956926386a2.tar.bz2 | |
Merge branch 'android-3.0' into android-omap-3.0
Conflicts:
drivers/usb/musb/omap2430.c
Change-Id: Iebe1aa88ead0d6128a5d5f426bbc0342827e238a
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/rc/winbond-cir.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c index 5d06b89..6f03846 100644 --- a/drivers/media/rc/winbond-cir.c +++ b/drivers/media/rc/winbond-cir.c @@ -1058,6 +1058,7 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id) goto exit_unregister_led; } + data->dev->driver_type = RC_DRIVER_IR_RAW; data->dev->driver_name = WBCIR_NAME; data->dev->input_name = WBCIR_NAME; data->dev->input_phys = "wbcir/cir0"; |