37fb5ab893
This only removes the patches already applied upstream and makes the rest apply cleanly. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 46128
24 lines
836 B
Diff
24 lines
836 B
Diff
From f5bc834917a8b1b9487749bdfe8eda52a01967b4 Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Date: Thu, 11 Jun 2015 22:57:36 +0200
|
|
Subject: [PATCH] USB: bcma: replace numbers with constants
|
|
|
|
The constants for these numbers were added long time ago, use them.
|
|
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
---
|
|
drivers/usb/host/bcma-hcd.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/usb/host/bcma-hcd.c
|
|
+++ b/drivers/usb/host/bcma-hcd.c
|
|
@@ -233,7 +233,8 @@ static int bcma_hcd_probe(struct bcma_de
|
|
|
|
/* In AI chips EHCI is addrspace 0, OHCI is 1 */
|
|
ohci_addr = dev->addr_s[0];
|
|
- if ((chipinfo->id == 0x5357 || chipinfo->id == 0x4749)
|
|
+ if ((chipinfo->id == BCMA_CHIP_ID_BCM5357 ||
|
|
+ chipinfo->id == BCMA_CHIP_ID_BCM4749)
|
|
&& chipinfo->rev == 0)
|
|
ohci_addr = 0x18009000;
|
|
|