git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
usb
/
misc
/
sisusbvga
/
sisusb_init.c
diff --git
a/drivers/usb/misc/sisusbvga/sisusb_init.c
b/drivers/usb/misc/sisusbvga/sisusb_init.c
index
9b30f89
..
044fa44
100644
(file)
--- a/
drivers/usb/misc/sisusbvga/sisusb_init.c
+++ b/
drivers/usb/misc/sisusbvga/sisusb_init.c
@@
-36,6
+36,7
@@
*
*/
*
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@
-73,7
+74,6
@@
SiSUSB_InitPtr(struct SiS_Private *SiS_Pr)
/* HELPER: Get ModeID */
/*********************************************/
/* HELPER: Get ModeID */
/*********************************************/
-#if 0
unsigned short
SiSUSB_GetModeID(int HDisplay, int VDisplay, int Depth)
{
unsigned short
SiSUSB_GetModeID(int HDisplay, int VDisplay, int Depth)
{
@@
-157,7
+157,6
@@
SiSUSB_GetModeID(int HDisplay, int VDisplay, int Depth)
return ModeIndex;
}
return ModeIndex;
}
-#endif /* 0 */
/*********************************************/
/* HELPER: SetReg, GetReg */
/*********************************************/
/* HELPER: SetReg, GetReg */
@@
-234,7
+233,7
@@
SiS_DisplayOn(struct SiS_Private *SiS_Pr)
/* HELPER: Init Port Addresses */
/*********************************************/
/* HELPER: Init Port Addresses */
/*********************************************/
-
static
void
+void
SiSUSBRegInit(struct SiS_Private *SiS_Pr, unsigned long BaseAddr)
{
SiS_Pr->SiS_P3c4 = BaseAddr + 0x14;
SiSUSBRegInit(struct SiS_Private *SiS_Pr, unsigned long BaseAddr)
{
SiS_Pr->SiS_P3c4 = BaseAddr + 0x14;