The patch titled
Remove duplicate define of OHCI_QUIRK_ZFMICRO
has been removed from the -mm tree. Its filename was
remove-duplicate-define-of-ohci_quirk_zfmicro.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Remove duplicate define of OHCI_QUIRK_ZFMICRO
From: "S.Caglar Onur" <caglar@xxxxxxxxxxxxx>
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@xxxxxxxxxxxxx>
Cc: <tony.olech@xxxxxxxxxxxxxxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/usb/misc/ftdi-elan.c | 1 -
1 file changed, 1 deletion(-)
diff -puN drivers/usb/misc/ftdi-elan.c~remove-duplicate-define-of-ohci_quirk_zfmicro drivers/usb/misc/ftdi-elan.c
--- a/drivers/usb/misc/ftdi-elan.c~remove-duplicate-define-of-ohci_quirk_zfmicro
+++ a/drivers/usb/misc/ftdi-elan.c
@@ -2304,7 +2304,6 @@ static int ftdi_elan_checkingPCI(struct
#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)
_
Patches currently in -mm which might be from caglar@xxxxxxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
