projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
drivers
/
amba
/
bus.c
diff --git
a/drivers/amba/bus.c
b/drivers/amba/bus.c
index
80f4de7
..
52ddd9f
100644
(file)
--- a/
drivers/amba/bus.c
+++ b/
drivers/amba/bus.c
@@
-343,7
+343,7
@@
int amba_device_add(struct amba_device *dev, struct resource *parent)
amba_put_disable_pclk(dev);
- if (cid == AMBA_CID)
+ if (cid == AMBA_CID
|| cid == CORESIGHT_CID
)
dev->periphid = pid;
if (!dev->periphid)