From: Pekka Enberg <penberg@kernel.org>
Date: Sun, 28 Nov 2010 21:00:02 +0000 (+0200)
Subject: Staging: w35und: Kill Vendor2 ifdef from hal_init_hardware
X-Git-Tag: upstream/snapshot3+hdmi~12088^2~173
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9255650cbf997762bd667896b0b86661cd81c9b4;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Staging: w35und: Kill Vendor2 ifdef from hal_init_hardware

The Vendor2 macro is never defined so remove the ifdef'd block from
hal_init_hardware().

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c
index 5f54b0f..9fc078f 100644
--- a/drivers/staging/winbond/wbusb.c
+++ b/drivers/staging/winbond/wbusb.c
@@ -642,13 +642,6 @@ static int hal_init_hardware(struct ieee80211_hw *hw)
 
 	SoftwareSet = hal_software_set(pHwData);
 
-#ifdef Vendor2
-	/* Try to make sure the EEPROM contain */
-	SoftwareSet >>= 8;
-	if (SoftwareSet != 0x82)
-		return false;
-#endif
-
 	Wb35Rx_start(hw);
 	Wb35Tx_EP2VM_start(priv);