# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.550 -> 1.551 # drivers/usb/host/uhci.h 1.11 -> 1.12 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 02/05/16 johannes@erdfelt.com 1.551 # [PATCH] 2.4.19-pre8 uhci.c incorrect bit operations # # Woops, I sent the wrong version. There was one extra line that was # required. # -------------------------------------------- # diff -Nru a/drivers/usb/host/uhci.h b/drivers/usb/host/uhci.h --- a/drivers/usb/host/uhci.h Fri May 17 15:16:23 2002 +++ b/drivers/usb/host/uhci.h Fri May 17 15:16:23 2002 @@ -126,7 +126,7 @@ #define uhci_maxlen(token) ((token) >> 21) #define uhci_expected_length(info) (((info >> 21) + 1) & TD_TOKEN_EXPLEN_MASK) /* 1-based */ -#define uhci_toggle(token) (((token) >> TD_TOKEN_TOGGLE) & 1) +#define uhci_toggle(token) (((token) >> TD_TOKEN_TOGGLE_SHIFT) & 1) #define uhci_endpoint(token) (((token) >> 15) & 0xf) #define uhci_devaddr(token) (((token) >> 8) & 0x7f) #define uhci_devep(token) (((token) >> 8) & 0x7ff)