From 3c070f6e0b1197001ad4f72b40c3dcb1a19231dc Mon Sep 17 00:00:00 2001 From: Kevin McKinney Date: Thu, 22 Nov 2012 14:48:32 -0500 Subject: [PATCH] --- yaml --- r: 338157 b: refs/heads/master c: d53fbe34d447596e389eddb1469ab1206eea7544 h: refs/heads/master i: 338155: 22711ba54014800636a02951ea38bb223cbd09e6 v: v3 --- [refs] | 2 +- trunk/drivers/staging/bcm/Ioctl.h | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 7ce4bdc8ae94..dbe4fb75e45b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25d41e2c707527147aa426266adefa7a6c7608b1 +refs/heads/master: d53fbe34d447596e389eddb1469ab1206eea7544 diff --git a/trunk/drivers/staging/bcm/Ioctl.h b/trunk/drivers/staging/bcm/Ioctl.h index 347bc4c03301..365228eca980 100644 --- a/trunk/drivers/staging/bcm/Ioctl.h +++ b/trunk/drivers/staging/bcm/Ioctl.h @@ -4,31 +4,31 @@ typedef struct rdmbuffer { ULONG Register; ULONG Length; -} __attribute__((packed)) RDM_BUFFER, *PRDM_BUFFER; +} __packed RDM_BUFFER, *PRDM_BUFFER; typedef struct wrmbuffer { ULONG Register; ULONG Length; UCHAR Data[4]; -} __attribute__((packed)) WRM_BUFFER, *PWRM_BUFFER; +} __packed WRM_BUFFER, *PWRM_BUFFER; typedef struct ioctlbuffer { void __user *InputBuffer; ULONG InputLength; void __user *OutputBuffer; ULONG OutputLength; -} __attribute__((packed)) IOCTL_BUFFER, *PIOCTL_BUFFER; +} __packed IOCTL_BUFFER, *PIOCTL_BUFFER; typedef struct stGPIOInfo { UINT uiGpioNumber; /* valid numbers 0-15 */ UINT uiGpioValue; /* 1 set ; 0 not set */ -} __attribute__((packed))GPIO_INFO, *PGPIO_INFO; +} __packed GPIO_INFO, *PGPIO_INFO; typedef struct stUserThreadReq { /* 0->Inactivate LED thread. */ /* 1->Activate the LED thread */ UINT ThreadState; -} __attribute__((packed))USER_THREAD_REQ, *PUSER_THREAD_REQ; +} __packed USER_THREAD_REQ, *PUSER_THREAD_REQ; #define LED_THREAD_ACTIVATION_REQ 1 #define BCM_IOCTL 'k' @@ -223,11 +223,11 @@ typedef struct stGPIOMultiInfo { UINT uiGPIOCommand; /* 1 for set and 0 for get */ UINT uiGPIOMask; /* set the correspondig bit to 1 to access GPIO */ UINT uiGPIOValue; /* 0 or 1; value to be set when command is 1. */ -} __attribute__((packed))GPIO_MULTI_INFO, *PGPIO_MULTI_INFO; +} __packed GPIO_MULTI_INFO, *PGPIO_MULTI_INFO; typedef struct stGPIOMultiMode { UINT uiGPIOMode; /* 1 for OUT mode, 0 for IN mode */ UINT uiGPIOMask; /* GPIO mask to set mode */ -} __attribute__((packed))GPIO_MULTI_MODE, *PGPIO_MULTI_MODE; +} __packed GPIO_MULTI_MODE, *PGPIO_MULTI_MODE; #endif