git.samba.org
/
sfrench
/
cifs-2.6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
5cb1ac0
)
Merge tag 'arm-soc/for-4.12/drivers-fixes' of http://github.com/Broadcom/stblinux...
author
Olof Johansson
<olof@lixom.net>
Fri, 19 May 2017 06:56:26 +0000
(23:56 -0700)
committer
Olof Johansson
<olof@lixom.net>
Fri, 19 May 2017 06:56:26 +0000
(23:56 -0700)
This pull request contains Broadcom SoC drivers fixes for 4.12, please
pull the following:
- Florian removes the duplicate compatible string matched by the
SUN_TOP_CTRL driver and instead uses the correct one for 7435
* tag 'arm-soc/for-4.12/drivers-fixes' of http://github.com/Broadcom/stblinux:
soc: bcm: brcmstb: Correctly match 7435 SoC
Signed-off-by: Olof Johansson <olof@lixom.net>
drivers/soc/bcm/brcmstb/common.c
patch
|
blob
|
history
diff --git
a/drivers/soc/bcm/brcmstb/common.c
b/drivers/soc/bcm/brcmstb/common.c
index b6195fdf0d0033c7ec24afb9cff100cd5dcf0978..22e98a90468c8e35d50e0a1f0da0f73c177084f5 100644
(file)
--- a/
drivers/soc/bcm/brcmstb/common.c
+++ b/
drivers/soc/bcm/brcmstb/common.c
@@
-49,7
+49,7
@@
static const struct of_device_id sun_top_ctrl_match[] = {
{ .compatible = "brcm,bcm7420-sun-top-ctrl", },
{ .compatible = "brcm,bcm7425-sun-top-ctrl", },
{ .compatible = "brcm,bcm7429-sun-top-ctrl", },
- { .compatible = "brcm,bcm74
2
5-sun-top-ctrl", },
+ { .compatible = "brcm,bcm74
3
5-sun-top-ctrl", },
{ .compatible = "brcm,brcmstb-sun-top-ctrl", },
{ }
};