---

yaml --- r: 338173 b: refs/heads/master c: ff31e74 h: refs/heads/master i: 338171: ea5c0ea v: v3
git-mirror · Nov 27, 2012 · ea7022d · ea7022d
1 parent 0f73faa
commit ea7022d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4a29e104aca0fe7fe946b0111122d4217e3dcbb
+refs/heads/master: ff31e745cdec6fac43a8bbfc3b978937da75a2a4
diff --git a/trunk/drivers/staging/bcm/Bcmchar.c b/trunk/drivers/staging/bcm/Bcmchar.c
@@ -1955,7 +1955,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 	break;
 
 	case IOCTL_BCM_GET_DEVICE_DRIVER_INFO: {
-		DEVICE_DRIVER_INFO DevInfo;
+		struct bcm_driver_info DevInfo;
 
 		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Called IOCTL_BCM_GET_DEVICE_DRIVER_INFO\n");
 

diff --git a/trunk/drivers/staging/bcm/Ioctl.h b/trunk/drivers/staging/bcm/Ioctl.h
@@ -107,14 +107,14 @@ typedef enum _BCM_INTERFACE_TYPE {
 	BCM_PCMCIA
 } BCM_INTERFACE_TYPE;
 
-typedef struct _DEVICE_DRIVER_INFO {
+struct bcm_driver_info {
 	NVM_TYPE	u32NVMType;
 	unsigned int		MaxRDMBufferSize;
 	BCM_INTERFACE_TYPE	u32InterfaceType;
 	unsigned int		u32DSDStartOffset;
 	unsigned int		u32RxAlignmentCorrection;
 	unsigned int		u32Reserved[10];
-} DEVICE_DRIVER_INFO;
+};
 
 struct bcm_nvm_readwrite {
 	void __user *pBuffer;