diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-08-22 05:11:58 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-08-22 05:15:14 +0300 |
| commit | a9d3965f76e317e2bd3d841dcf3d8ad5794121df (patch) | |
| tree | 4d9d06767023013b2a0fabdab6075ed5fca2dd1b /drivers | |
| parent | 6681618814b4dcca905700af36c240e01c42146b (diff) | |
| parent | 57e493aff59529b0ed503ec1540e6125c84f9053 (diff) | |
| download | linux-a9d3965f76e317e2bd3d841dcf3d8ad5794121df.tar.xz | |
Merge tag 'arm-soc/for-6.6/drivers' of https://github.com/Broadcom/stblinux into soc/drivers
This pull request contains Broadcom SoCs drivers changes for 6.6, please
pull the following:
- Rob updates the Broadcom SoC drivers to use the correct DT includes
* tag 'arm-soc/for-6.6/drivers' of https://github.com/Broadcom/stblinux:
soc: bcm: Explicitly include correct DT includes
Link: https://lore.kernel.org/r/20230818164539.2871539-3-florian.fainelli@broadcom.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/genpd/bcm/bcm-pmb.c | 1 | ||||
| -rw-r--r-- | drivers/genpd/bcm/bcm63xx-power.c | 1 | ||||
| -rw-r--r-- | drivers/genpd/bcm/raspberrypi-power.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/drivers/genpd/bcm/bcm-pmb.c b/drivers/genpd/bcm/bcm-pmb.c index 9407cac47fdb..a72ba26ecf9d 100644 --- a/drivers/genpd/bcm/bcm-pmb.c +++ b/drivers/genpd/bcm/bcm-pmb.c @@ -8,7 +8,6 @@ #include <linux/io.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/pm_domain.h> #include <linux/reset/bcm63xx_pmb.h> diff --git a/drivers/genpd/bcm/bcm63xx-power.c b/drivers/genpd/bcm/bcm63xx-power.c index aa72e13d5d0e..98b0c2430dbc 100644 --- a/drivers/genpd/bcm/bcm63xx-power.c +++ b/drivers/genpd/bcm/bcm63xx-power.c @@ -14,7 +14,6 @@ #include <linux/platform_device.h> #include <linux/pm_domain.h> #include <linux/of.h> -#include <linux/of_device.h> struct bcm63xx_power_dev { struct generic_pm_domain genpd; diff --git a/drivers/genpd/bcm/raspberrypi-power.c b/drivers/genpd/bcm/raspberrypi-power.c index 58175af982a0..06196ebfe03b 100644 --- a/drivers/genpd/bcm/raspberrypi-power.c +++ b/drivers/genpd/bcm/raspberrypi-power.c @@ -7,7 +7,7 @@ */ #include <linux/module.h> -#include <linux/of_platform.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/pm_domain.h> #include <dt-bindings/power/raspberrypi-power.h> |