Prev: drm-intel changes for 2.6.35-rc1
Next: [PATCH 0/7] *** SUBJECT HERE ***
From: Riccardo Magliocchetti on 5 Jun 2010 12:10
Signed-off-by: Riccardo Magliocchetti <riccardo.magliocchetti(a)gmail.com>
---
drivers/staging/xgifb/XGI_main.h | 2 ++
drivers/staging/xgifb/XGI_main_26.c | 7 +++++--
2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h
index 6d3a870..c05bade 100644
--- a/drivers/staging/xgifb/XGI_main.h
+++ b/drivers/staging/xgifb/XGI_main.h
@@ -348,7 +348,9 @@ static int XGIfb_userom = 0;
static int XGIfb_registered;
static int XGIfb_tvmode = 0;
static int XGIfb_mem = 0;
+#ifndef MODULE
static int XGIfb_pdc = 0;
+#endif
static int enable_dstn = 0;
static int XGIfb_ypan = -1;

diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index 0487a1e..05e4603 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -849,6 +849,7 @@ static int XGIfb_validate_mode(int myindex)

}

+#ifndef MODULE
static void XGIfb_search_crt2type(const char *name)
{
int i = 0;
@@ -885,6 +886,7 @@ static void XGIfb_search_queuemode(const char *name)
if (XGIfb_queuemode < 0)
printk(KERN_INFO "XGIfb: Invalid queuemode type: %s\n", name);
}
+#endif

static u8 XGIfb_search_refresh_rate(unsigned int rate)
{
@@ -932,6 +934,7 @@ static u8 XGIfb_search_refresh_rate(unsigned int rate)
}
}

+#ifndef MODULE
static void XGIfb_search_tvstd(const char *name)
{
int i = 0;
@@ -947,6 +950,7 @@ static void XGIfb_search_tvstd(const char *name)
i++;
}
}
+#endif

static BOOLEAN XGIfb_bridgeisslave(void)
{
@@ -3485,7 +3489,7 @@ int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

XGIfb_registered = 1;

- printk(KERN_INFO "XGIfb: Installed XGIFB_GET_INFO ioctl (%x)\n", XGIFB_GET_INFO);
+ printk(KERN_INFO "XGIfb: Installed XGIFB_GET_INFO ioctl (%lx)\n", XGIFB_GET_INFO);

/* printk(KERN_INFO "XGIfb: 2D acceleration is %s, scrolling mode %s\n",
XGIfb_accel ? "enabled" : "disabled",
@@ -3551,7 +3555,6 @@ module_init(xgifb_init);
static char *mode = NULL;
static int vesa = 0;
static unsigned int rate = 0;
-static unsigned int crt1off = 1;
static unsigned int mem = 0;
static char *forcecrt2type = NULL;
static int forcecrt1 = -1;
--
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: drm-intel changes for 2.6.35-rc1
Next: [PATCH 0/7] *** SUBJECT HERE ***