Commit fabd3152 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Tomi Valkeinen

video/mbx: fix building debugfs support

The mbx framebuffer debugfs support apparently hasn't been able
to build for a long time, at least since 2006 when the u.generic_ip
field in the inode was removed. This fixes the obvious bug, and
also makes it possible to build the driver as a module when
debugfs support is enabled, by simply including the C file.
It's ugly, but it won't make the driver any worse than it
already is, and doesn't require a more invasive change that
might break it further.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarPeter Griffin <peter.griffin@linaro.org>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-fbdev@vger.kernel.org
Cc: Raphael Assenat <raph@8d.com>
Cc: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 81c44c2b
# Makefile for the 2700G controller driver. # Makefile for the 2700G controller driver.
obj-$(CONFIG_FB_MBX) += mbxfb.o obj-y += mbxfb.o
obj-$(CONFIG_FB_MBX_DEBUG) += mbxfbdebugfs.o
...@@ -17,7 +17,7 @@ struct mbxfb_debugfs_data { ...@@ -17,7 +17,7 @@ struct mbxfb_debugfs_data {
static int open_file_generic(struct inode *inode, struct file *file) static int open_file_generic(struct inode *inode, struct file *file)
{ {
file->private_data = inode->u.generic_ip; file->private_data = inode->i_private;
return 0; return 0;
} }
......
...@@ -877,6 +877,8 @@ static int mbxfb_resume(struct platform_device *dev) ...@@ -877,6 +877,8 @@ static int mbxfb_resume(struct platform_device *dev)
#ifndef CONFIG_FB_MBX_DEBUG #ifndef CONFIG_FB_MBX_DEBUG
#define mbxfb_debugfs_init(x) do {} while(0) #define mbxfb_debugfs_init(x) do {} while(0)
#define mbxfb_debugfs_remove(x) do {} while(0) #define mbxfb_debugfs_remove(x) do {} while(0)
#else
#include "mbxdebugfs.c"
#endif #endif
#define res_size(_r) (((_r)->end - (_r)->start) + 1) #define res_size(_r) (((_r)->end - (_r)->start) + 1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment