diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
| commit | 87d721ad7a37b7650dd710c88dd5c6a5bf9fe996 (patch) | |
| tree | 869d633803eb7c429624d3bd16a6117816849763 /drivers/media/dvb/dvb-usb/af9015.c | |
| parent | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (diff) | |
| parent | b7cfda9fc3d7aa60cffab5367f2a72a4a70060cd (diff) | |
Merge branch 'master' into devel
Diffstat (limited to 'drivers/media/dvb/dvb-usb/af9015.c')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/af9015.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c index 4cb31e7c13c2..26690dfb3260 100644 --- a/drivers/media/dvb/dvb-usb/af9015.c +++ b/drivers/media/dvb/dvb-usb/af9015.c | |||
| @@ -81,7 +81,6 @@ static int af9015_rw_udev(struct usb_device *udev, struct req_t *req) | |||
| 81 | 81 | ||
| 82 | switch (req->cmd) { | 82 | switch (req->cmd) { |
| 83 | case GET_CONFIG: | 83 | case GET_CONFIG: |
| 84 | case BOOT: | ||
| 85 | case READ_MEMORY: | 84 | case READ_MEMORY: |
| 86 | case RECONNECT_USB: | 85 | case RECONNECT_USB: |
| 87 | case GET_IR_CODE: | 86 | case GET_IR_CODE: |
| @@ -100,6 +99,7 @@ static int af9015_rw_udev(struct usb_device *udev, struct req_t *req) | |||
| 100 | case WRITE_VIRTUAL_MEMORY: | 99 | case WRITE_VIRTUAL_MEMORY: |
| 101 | case COPY_FIRMWARE: | 100 | case COPY_FIRMWARE: |
| 102 | case DOWNLOAD_FIRMWARE: | 101 | case DOWNLOAD_FIRMWARE: |
| 102 | case BOOT: | ||
| 103 | break; | 103 | break; |
| 104 | default: | 104 | default: |
| 105 | err("unknown command:%d", req->cmd); | 105 | err("unknown command:%d", req->cmd); |