diff --git a/[refs] b/[refs] index 2dc9336ba615..bb97c54e30f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 572225bedf8e39b5dd7cc687a51015edbb738401 +refs/heads/master: c2604ce05853939cf712ebc5acc0da4011289346 diff --git a/trunk/drivers/char/drm/drm_bufs.c b/trunk/drivers/char/drm/drm_bufs.c index 4440257f33e4..dde612091005 100644 --- a/trunk/drivers/char/drm/drm_bufs.c +++ b/trunk/drivers/char/drm/drm_bufs.c @@ -69,7 +69,7 @@ int drm_map_handle(drm_device_t *dev, drm_hash_item_t *hash, unsigned long user_token, int hashed_handle) { int use_hashed_handle; - #if (BITS_PER_LONG == 64) +#if (BITS_PER_LONG == 64) use_hashed_handle = ((user_token & 0xFFFFFFFF00000000UL) || hashed_handle); #elif (BITS_PER_LONG == 32) use_hashed_handle = hashed_handle;