p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fbdev: Make fb-notify a no-op if CONFIG_FB=n 

There's no point in having support for framebuffer notifications
is CONFIG_FB is disabled. This commit adds the necessary stubs
for code to link properly when CONFIG_FB=n and moves fb-notify.o
to be built only when CONFIG_FB=y.

Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Ezequiel Garcia 2015-11-25 00:11:48 -03:00 committed by Tomi Valkeinen
parent c3c296b069
commit 5ec9653806
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/video/fbdev/Kconfig
View File

@ -5,6 +5,7 @@
menuconfig FB menuconfig FB
tristate "Support for frame buffer devices" tristate "Support for frame buffer devices"
select FB_CMDLINE select FB_CMDLINE
select FB_NOTIFY
---help--- ---help---
The frame buffer device provides an abstraction for the graphics The frame buffer device provides an abstraction for the graphics
hardware. It represents the frame buffer of some video hardware and hardware. It represents the frame buffer of some video hardware and
@ -56,6 +57,9 @@ config FIRMWARE_EDID
config FB_CMDLINE config FB_CMDLINE
bool bool
config FB_NOTIFY
bool
config FB_DDC config FB_DDC
tristate tristate
depends on FB depends on FB

2
drivers/video/fbdev/core/Makefile
View File

@ -1,5 +1,5 @@
obj-y += fb_notify.o
obj-$(CONFIG_FB_CMDLINE) += fb_cmdline.o obj-$(CONFIG_FB_CMDLINE) += fb_cmdline.o
obj-$(CONFIG_FB_NOTIFY) += fb_notify.o
obj-$(CONFIG_FB) += fb.o obj-$(CONFIG_FB) += fb.o
fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \ fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \
modedb.o fbcvt.o modedb.o fbcvt.o

18
include/linux/fb.h
View File

@ -175,9 +175,27 @@ struct fb_blit_caps {
u32 flags; u32 flags;
}; };
#ifdef CONFIG_FB_NOTIFY
extern int fb_register_client(struct notifier_block *nb); extern int fb_register_client(struct notifier_block *nb);
extern int fb_unregister_client(struct notifier_block *nb); extern int fb_unregister_client(struct notifier_block *nb);
extern int fb_notifier_call_chain(unsigned long val, void *v); extern int fb_notifier_call_chain(unsigned long val, void *v);
#else
static inline int fb_register_client(struct notifier_block *nb)
{
return 0;
};
static inline int fb_unregister_client(struct notifier_block *nb)
{
return 0;
};
static inline int fb_notifier_call_chain(unsigned long val, void *v)
{
return 0;
};
#endif
/* /*
* Pixmap structure definition * Pixmap structure definition
* *