From 492804de819cf26218aaa6b62f0a8c7fa3fa2681 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@gmail.com>
Date: Fri, 15 Oct 2010 14:12:58 +0200
Subject: [PATCH] --- yaml --- r: 220359 b: refs/heads/master c:
 1b8a30121717c04ecd18a8d5f385530e039d7ac2 h: refs/heads/master i:   220357:
 f9f8a36f13fd46f0828e1357cfbabc9933b6fcee   220355:
 c8d54147e7db7ea47fb735a80e7132d13e161d43   220351:
 2637c1302711c101ca877b7268d1306ea7fed0fe v: v3

---
 [refs]                                               | 2 +-
 trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c  | 4 ++--
 trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 4cdf0e40b25d..caac2b75e4f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7dc591159928a0281f946d2b44510ced08f2a13c
+refs/heads/master: 1b8a30121717c04ecd18a8d5f385530e039d7ac2
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index 2b9131af83f6..0cac0fb83d45 100644
--- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -2080,7 +2080,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) {
 	FT1000_INFO *info = (FT1000_INFO *) netdev_priv (dev->net);
     u16 msgtype;
     u16 tempword;
-    PMEDIAMSG pmediamsg;
+	struct media_msg *pmediamsg;
     PDSPINITMSG pdspinitmsg;
     PDRVMSG pdrvmsg;
     u16 i;
@@ -2126,7 +2126,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) {
             case MEDIA_STATE: {
                 DEBUG("ft1000_proc_drvmsg:Command message type = MEDIA_STATE");
 
-                pmediamsg = (PMEDIAMSG)&cmdbuffer[0];
+		pmediamsg = (struct media_msg *)&cmdbuffer[0];
                 if (info->ProgConStat != 0xFF) {
                     if (pmediamsg->state) {
                         DEBUG("Media is up\n");
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index 764e9f2eb329..3e33c639a680 100644
--- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -51,7 +51,7 @@
 
 
 
-typedef struct _MEDIAMSG {
+struct media_msg {
 	PSEUDO_HDR pseudo;
 	u16 type;
 	u16 length;
@@ -61,7 +61,7 @@ typedef struct _MEDIAMSG {
 	u32 gateway;
 	u32 dns_1;
 	u32 dns_2;
-} __attribute__ ((packed)) MEDIAMSG, *PMEDIAMSG;
+} __attribute__ ((packed));
 
 typedef struct _DSPINITMSG {
     PSEUDO_HDR pseudo;
@@ -97,7 +97,6 @@ typedef struct _PROV_RECORD {
 } PROV_RECORD, *PPROV_RECORD;
 
 /*end of Jim*/
-
 #define DEBUG(args...) printk(KERN_INFO args)
 
 #define UCHAR               u8