From 3c22225963b03833a1b5f67b7ba550461e7027e8 Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Thu, 22 Nov 2012 14:48:33 -0500
Subject: [PATCH] --- yaml --- r: 338158 b: refs/heads/master c:
 0b512e49e1632925e97ee9f4b56bab8ff373dc02 h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/staging/bcm/Ioctl.h | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index dbe4fb75e45b..428d60d1baae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d53fbe34d447596e389eddb1469ab1206eea7544
+refs/heads/master: 0b512e49e1632925e97ee9f4b56bab8ff373dc02
diff --git a/trunk/drivers/staging/bcm/Ioctl.h b/trunk/drivers/staging/bcm/Ioctl.h
index 365228eca980..e6d2d599208a 100644
--- a/trunk/drivers/staging/bcm/Ioctl.h
+++ b/trunk/drivers/staging/bcm/Ioctl.h
@@ -9,7 +9,7 @@ typedef struct rdmbuffer {
 typedef struct wrmbuffer {
 	ULONG Register;
 	ULONG Length;
-	UCHAR Data[4];
+	unsigned char Data[4];
 } __packed WRM_BUFFER, *PWRM_BUFFER;
 
 typedef struct ioctlbuffer {
@@ -192,20 +192,20 @@ typedef enum _SECTION_TYPE {
  */
 
 typedef struct _FLASH2X_BITMAP {
-	UCHAR ISO_IMAGE1;
-	UCHAR ISO_IMAGE2;
-	UCHAR DSD0;
-	UCHAR DSD1;
-	UCHAR DSD2;
-	UCHAR VSA0;
-	UCHAR VSA1;
-	UCHAR VSA2;
-	UCHAR SCSI;
-	UCHAR CONTROL_SECTION;
+	unsigned char ISO_IMAGE1;
+	unsigned char ISO_IMAGE2;
+	unsigned char DSD0;
+	unsigned char DSD1;
+	unsigned char DSD2;
+	unsigned char VSA0;
+	unsigned char VSA1;
+	unsigned char VSA2;
+	unsigned char SCSI;
+	unsigned char CONTROL_SECTION;
 	/* Reserved for future use */
-	UCHAR Reserved0;
-	UCHAR Reserved1;
-	UCHAR Reserved2;
+	unsigned char Reserved0;
+	unsigned char Reserved1;
+	unsigned char Reserved2;
 } FLASH2X_BITMAP, *PFLASH2X_BITMAP;
 
 typedef struct _ST_TIME_ELAPSED_ {