mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
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 -----BEGIN PGP SIGNATURE----- iQIcBAABCAAGBQJZF8/zAAoJEIfQlpxEBwcEzGQP/jDPMxQZM61C4MFVqNg5N4Vg aBIDpT/3OQ/cM4e4Xw/ewf8suQwq3s5Gl64DcYFHpe249EW32CKa97Sssv6o1M5S iR03ocwSPEt0V1r4LPvkTkpFPGKdBj0dHofS/UCZJJAq0iOlYQQ+Xe1gVAzeV7DS 4+oXHnZHsBVJAEnqwbWoPz32M96k1nzgtkMjwdWiotceDQk8N4XbFVwvCFjTH03v ZpghAp4hQEaMH0WlU3tqOwWXqRBYNjuPQeHYGJlRehuP4hRuylugO1HpkaqxU/ZS Uey+PUr98rkJ2dUZ2SRf9MFAY9Cj1/xr6I4tFksr4wMMdiMi5lHz2DQBPp5FtAbu TpK9TKVMZ0VxrJH9HKureAY9xoN56sROjaXDIwaesxbdlrYjXKLwq9Ys9VMr8y9Y g//TpFsH6j5GFNkajEZIgKUArL+G3rliLClbP2WbK2w0twIzFsYBQI4LN73Iwyre cVTzBUXxUtIA2WI01P7BtqEOGrJjjx0tRP/8/5MTMv8l5eiJtZMLPjx/HTZF9gYF hScJjwEWEQDvQmNav8kvO7ZAGfAgqULYyLhV22YL2q2VutsOIELL1TQsAymn3MuH 0OdGthJKWP4IDKQn52xH3mGSz94Q8YfEBQoNLf00a40FWjZn7icySC3ekabHaY5f EWv7OG5MKvae99vWw/w6 =Clk8 -----END PGP SIGNATURE----- Merge tag 'arm-soc/for-4.12/drivers-fixes' of http://github.com/Broadcom/stblinux into fixes 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>
This commit is contained in:
commit
3d2ba3fb54
1 changed files with 1 additions and 1 deletions
|
@ -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,bcm7425-sun-top-ctrl", },
|
||||
{ .compatible = "brcm,bcm7435-sun-top-ctrl", },
|
||||
{ .compatible = "brcm,brcmstb-sun-top-ctrl", },
|
||||
{ }
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue