diff --git a/[refs] b/[refs] index 11f42dbdf920..f9fa7e54eb11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3850a8ae43a1d93cda1f9a9132d41b98d825f6a3 +refs/heads/master: cae16a1742ad3cc19f15e78b821b94448e330ad9 diff --git a/trunk/drivers/staging/crystalhd/crystalhd_lnx.h b/trunk/drivers/staging/crystalhd/crystalhd_lnx.h index c951e43cbb3d..a2b5a56be6dd 100644 --- a/trunk/drivers/staging/crystalhd/crystalhd_lnx.h +++ b/trunk/drivers/staging/crystalhd/crystalhd_lnx.h @@ -76,7 +76,7 @@ struct crystalhd_adp { spinlock_t lock; /* API Related */ - unsigned int chd_dec_major; + int chd_dec_major; unsigned int cfg_users; struct crystalhd_ioctl_data *idata_free_head; /* ioctl data pool */