Skip to content

Commit f25eae2

Browse files
Thomas Zimmermannarndb
authored andcommitted
arch: Select fbdev helpers with CONFIG_VIDEO
Various Kconfig options selected the per-architecture helpers for fbdev. But none of the contained code depends on fbdev. Standardize on CONFIG_VIDEO, which will allow to add more general helpers for video functionality. CONFIG_VIDEO protects each architecture's video/ directory. This allows for the use of more fine-grained control for each directory's files, such as the use of CONFIG_STI_CORE on parisc. v2: - sparc: rebased onto Makefile changes Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Sam Ravnborg <sam@ravnborg.org> Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> Cc: Helge Deller <deller@gmx.de> Cc: "David S. Miller" <davem@davemloft.net> Cc: Andreas Larsson <andreas@gaisler.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: x86@kernel.org Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent 9c313cc commit f25eae2

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

arch/parisc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export LIBGCC
119119

120120
libs-y += arch/parisc/lib/ $(LIBGCC)
121121

122-
drivers-y += arch/parisc/video/
122+
drivers-$(CONFIG_VIDEO) += arch/parisc/video/
123123

124124
boot := arch/parisc/boot
125125

arch/sparc/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ endif
5959
libs-y += arch/sparc/prom/
6060
libs-y += arch/sparc/lib/
6161

62-
drivers-$(CONFIG_PM) += arch/sparc/power/
63-
drivers-$(CONFIG_FB_CORE) += arch/sparc/video/
62+
drivers-$(CONFIG_PM) += arch/sparc/power/
63+
drivers-$(CONFIG_VIDEO) += arch/sparc/video/
6464

6565
boot := arch/sparc/boot
6666

arch/sparc/video/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22

3-
obj-$(CONFIG_FB_CORE) += fbdev.o
3+
obj-y += fbdev.o

arch/x86/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ drivers-$(CONFIG_PCI) += arch/x86/pci/
258258
# suspend and hibernation support
259259
drivers-$(CONFIG_PM) += arch/x86/power/
260260

261-
drivers-$(CONFIG_FB_CORE) += arch/x86/video/
261+
drivers-$(CONFIG_VIDEO) += arch/x86/video/
262262

263263
####
264264
# boot loader support. Several targets are kept for legacy purposes

arch/x86/video/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
obj-$(CONFIG_FB_CORE) += fbdev.o
2+
3+
obj-y += fbdev.o

0 commit comments

Comments
 (0)