diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-06-27 06:40:44 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-06-27 06:40:44 -0400 |
| commit | 4300a0f8bdcce5a03b88bfa16fc9827e15c52dc4 (patch) | |
| tree | dea0276d7d0a12147f04ddbef9121e32e903c5ca /drivers/usb/serial/ark3116.c | |
| parent | 160954b7bca43da7cd3cfbce310e6df919a8216e (diff) | |
| parent | 9e895ace5d82df8929b16f58e9f515f6d54ab82d (diff) | |
Merge tag 'v3.10-rc7' into drm-next
Linux 3.10-rc7
The sdvo lvds fix in this -fixes pull
commit c3456fb3e4712d0448592af3c5d644c9472cd3c1
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon Jun 10 09:47:58 2013 +0200
drm/i915: prefer VBT modes for SVDO-LVDS over EDID
has a silent functional conflict with
commit 990256aec2f10800595dddf4d1c3441fcd6b2616
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Fri May 31 12:17:07 2013 +0000
drm: Add probed modes in probe order
in drm-next. W simply need to add the vbt modes before edid modes, i.e. the
other way round than now.
Conflicts:
drivers/gpu/drm/drm_prime.c
drivers/gpu/drm/i915/intel_sdvo.c
Diffstat (limited to 'drivers/usb/serial/ark3116.c')
| -rw-r--r-- | drivers/usb/serial/ark3116.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c index 3b16118cbf62..40e7fd94646f 100644 --- a/drivers/usb/serial/ark3116.c +++ b/drivers/usb/serial/ark3116.c | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | #define DRIVER_NAME "ark3116" | 43 | #define DRIVER_NAME "ark3116" |
| 44 | 44 | ||
| 45 | /* usb timeout of 1 second */ | 45 | /* usb timeout of 1 second */ |
| 46 | #define ARK_TIMEOUT (1*HZ) | 46 | #define ARK_TIMEOUT 1000 |
| 47 | 47 | ||
| 48 | static const struct usb_device_id id_table[] = { | 48 | static const struct usb_device_id id_table[] = { |
| 49 | { USB_DEVICE(0x6547, 0x0232) }, | 49 | { USB_DEVICE(0x6547, 0x0232) }, |