diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-16 12:01:42 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-16 12:01:42 -0400 |
| commit | 8626e4a42675ff9903f7d4fbf14d8ebc11b5926c (patch) | |
| tree | c631dfe2854cb1382a5d8f5aa11b071762ddf27d /drivers/gpu/drm/udl/udl_main.c | |
| parent | a8d8f02cf0c379693762107afe812b9e52090e39 (diff) | |
| parent | 9249e17fe094d853d1ef7475dd559a2cc7e23d42 (diff) | |
Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6
Resolve conflicts with the VFS atomic open and sget changes.
Conflicts:
fs/nfs/nfs4proc.c
Diffstat (limited to 'drivers/gpu/drm/udl/udl_main.c')
| -rw-r--r-- | drivers/gpu/drm/udl/udl_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c index a8d5f09428c7..4c2d836a0893 100644 --- a/drivers/gpu/drm/udl/udl_main.c +++ b/drivers/gpu/drm/udl/udl_main.c | |||
| @@ -61,7 +61,7 @@ static int udl_parse_vendor_descriptor(struct drm_device *dev, | |||
| 61 | u8 length; | 61 | u8 length; |
| 62 | u16 key; | 62 | u16 key; |
| 63 | 63 | ||
| 64 | key = *((u16 *) desc); | 64 | key = le16_to_cpu(*((u16 *) desc)); |
| 65 | desc += sizeof(u16); | 65 | desc += sizeof(u16); |
| 66 | length = *desc; | 66 | length = *desc; |
| 67 | desc++; | 67 | desc++; |