From: S.Caglar Onur <caglar@pardus.org.tr>
Date: Thu, 26 Apr 2007 07:38:03 +0000 (-0700)
Subject: USB: Remove duplicate define of OHCI_QUIRK_ZFMICRO
X-Git-Tag: v2.6.22-rc1~1117^2~15
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5c975acb99168827a8ce5453be0e44ad2e4b70b2;p=linux-2.6-omap-h63xx.git

USB: Remove duplicate define of OHCI_QUIRK_ZFMICRO

Remove duplicate define of OHCI_QUIRK_ZFMICRO from ftdi-elan.c, its already
defined in drivers/ush/host/ohci.c

Signed-off-by: "S.Caglar Onur" <caglar@pardus.org.tr>
Cc: <tony.olech@elandigitalsystems.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c
index d9cbdb87fac..e2172e5cf15 100644
--- a/drivers/usb/misc/ftdi-elan.c
+++ b/drivers/usb/misc/ftdi-elan.c
@@ -2304,7 +2304,6 @@ static int ftdi_elan_checkingPCI(struct usb_ftdi *ftdi)
 #define OHCI_QUIRK_SUPERIO 0x02
 #define OHCI_QUIRK_INITRESET 0x04
 #define OHCI_BIG_ENDIAN 0x08
-#define OHCI_QUIRK_ZFMICRO 0x10
 #define OHCI_CONTROL_INIT OHCI_CTRL_CBSR
 #define OHCI_INTR_INIT (OHCI_INTR_MIE | OHCI_INTR_UE | OHCI_INTR_RD | \
         OHCI_INTR_WDH)