Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / staging / crystalhd / crystalhd_lnx.h

diff --git a/drivers/staging/crystalhd/crystalhd_lnx.h b/drivers/staging/crystalhd/crystalhd_lnx.h
index c951e43cbb3db9ccb3e3d17fe4fdc4ef6e3d4c1a..a2b5a56be6ddd4b817904ea3961917b59f0b4faa 100644 (file)
--- a/drivers/staging/crystalhd/crystalhd_lnx.h
+++ b/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 */