diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2022-09-14 13:22:18 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2022-09-14 13:22:18 +0200 |
| commit | a108772d03d8bdb43258218b00bfe43bbe1e8800 (patch) | |
| tree | 11b1f413ab384f2b5de0773f01b6886e2c601f8b /drivers/Makefile | |
| parent | drm/amd/pm: remove unused declarations in hardwaremanager.h (diff) | |
| parent | Merge tag 'drm-intel-gt-next-2022-09-09' of git://anongit.freedesktop.org/drm... (diff) | |
| download | linux-a108772d03d8bdb43258218b00bfe43bbe1e8800.tar.xz linux-a108772d03d8bdb43258218b00bfe43bbe1e8800.zip | |
Merge drm/drm-next into drm-misc-next
We need 6.0-rc1 to merge the backlight rework PR.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 9a30842b22c5..057857258bfd 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -165,7 +165,6 @@ obj-$(CONFIG_PM_DEVFREQ) += devfreq/ obj-$(CONFIG_EXTCON) += extcon/ obj-$(CONFIG_MEMORY) += memory/ obj-$(CONFIG_IIO) += iio/ -obj-$(CONFIG_VME_BUS) += vme/ obj-$(CONFIG_IPACK_BUS) += ipack/ obj-$(CONFIG_NTB) += ntb/ obj-$(CONFIG_POWERCAP) += powercap/ @@ -176,7 +175,7 @@ obj-$(CONFIG_USB4) += thunderbolt/ obj-$(CONFIG_CORESIGHT) += hwtracing/coresight/ obj-y += hwtracing/intel_th/ obj-$(CONFIG_STM) += hwtracing/stm/ -obj-$(CONFIG_ANDROID) += android/ +obj-y += android/ obj-$(CONFIG_NVMEM) += nvmem/ obj-$(CONFIG_FPGA) += fpga/ obj-$(CONFIG_FSI) += fsi/ |