Commit 1ea673ad authored by Lubomir Rintel's avatar Lubomir Rintel Committed by Bartlomiej Zolnierkiewicz

video: fbdev: geode: remove ifdef OLPC noise

<asm/olpc.h> provides olpc_has_dcon() stub for CONFIG_OLPC=n, compiler
should just optimize the unneeded bits away.
Signed-off-by: default avatarLubomir Rintel <lkundrak@v3.sk>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent 89ef5c6a
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/cs5535.h> #include <linux/cs5535.h>
#include <asm/olpc.h>
#include "gxfb.h" #include "gxfb.h"
static char *mode_option; static char *mode_option;
...@@ -107,9 +109,6 @@ static struct fb_videomode gx_modedb[] = { ...@@ -107,9 +109,6 @@ static struct fb_videomode gx_modedb[] = {
FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
}; };
#ifdef CONFIG_OLPC
#include <asm/olpc.h>
static struct fb_videomode gx_dcon_modedb[] = { static struct fb_videomode gx_dcon_modedb[] = {
/* The only mode the DCON has is 1200x900 */ /* The only mode the DCON has is 1200x900 */
{ NULL, 50, 1200, 900, 17460, 24, 8, 4, 5, 8, 3, { NULL, 50, 1200, 900, 17460, 24, 8, 4, 5, 8, 3,
...@@ -128,14 +127,6 @@ static void get_modedb(struct fb_videomode **modedb, unsigned int *size) ...@@ -128,14 +127,6 @@ static void get_modedb(struct fb_videomode **modedb, unsigned int *size)
} }
} }
#else
static void get_modedb(struct fb_videomode **modedb, unsigned int *size)
{
*modedb = (struct fb_videomode *) gx_modedb;
*size = ARRAY_SIZE(gx_modedb);
}
#endif
static int gxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) static int gxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
{ {
if (var->xres > 1600 || var->yres > 1200) if (var->xres > 1600 || var->yres > 1200)
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/olpc.h>
#include "lxfb.h" #include "lxfb.h"
static char *mode_option; static char *mode_option;
...@@ -216,9 +218,6 @@ static struct fb_videomode geode_modedb[] = { ...@@ -216,9 +218,6 @@ static struct fb_videomode geode_modedb[] = {
0, FB_VMODE_NONINTERLACED, 0 }, 0, FB_VMODE_NONINTERLACED, 0 },
}; };
#ifdef CONFIG_OLPC
#include <asm/olpc.h>
static struct fb_videomode olpc_dcon_modedb[] = { static struct fb_videomode olpc_dcon_modedb[] = {
/* The only mode the DCON has is 1200x900 */ /* The only mode the DCON has is 1200x900 */
{ NULL, 50, 1200, 900, 17460, 24, 8, 4, 5, 8, 3, { NULL, 50, 1200, 900, 17460, 24, 8, 4, 5, 8, 3,
...@@ -237,14 +236,6 @@ static void get_modedb(struct fb_videomode **modedb, unsigned int *size) ...@@ -237,14 +236,6 @@ static void get_modedb(struct fb_videomode **modedb, unsigned int *size)
} }
} }
#else
static void get_modedb(struct fb_videomode **modedb, unsigned int *size)
{
*modedb = (struct fb_videomode *) geode_modedb;
*size = ARRAY_SIZE(geode_modedb);
}
#endif
static int lxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) static int lxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
{ {
if (var->xres > 1920 || var->yres > 1440) if (var->xres > 1920 || var->yres > 1440)
......
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