diff --git a/[refs] b/[refs]
index 02fede923c40..18259bf1c3c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd2ab67030e9116f1e4aae1289220255412b37fd
+refs/heads/master: 544451a1a36b06f43fc67112ede3b92e6203eb9d
diff --git a/trunk/include/linux/pnp.h b/trunk/include/linux/pnp.h
index 29dd55838e84..b2f05c230f4b 100644
--- a/trunk/include/linux/pnp.h
+++ b/trunk/include/linux/pnp.h
@@ -175,7 +175,7 @@ static inline void pnp_set_card_drvdata(struct pnp_card_link *pcard, void *data)
 struct pnp_dev {
 	struct device dev;		/* Driver Model device interface */
 	u64 dma_mask;
-	unsigned char number;		/* used as an index, must be unique */
+	unsigned int number;		/* used as an index, must be unique */
 	int status;
 
 	struct list_head global_list;	/* node in global list of devices */