Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 472 → Rev 473

/shark/trunk/drivers/fb/riva/fbdev.c
63,7 → 63,7
*
* ------------------------------------------------------------------------- */
 
#undef RIVAFBDEBUG
#define RIVAFBDEBUG
#ifdef RIVAFBDEBUG
#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)
#else
124,6 → 124,7
CH_GEFORCE2_GTS2,
CH_GEFORCE2_ULTRA,
CH_QUADRO2_PRO,
CH_TEST,
CH_GEFORCE4_MX_460,
CH_GEFORCE4_MX_440,
CH_GEFORCE4_MX_420,
171,6 → 172,7
{ "GeForce2-GTS", NV_ARCH_10 },
{ "GeForce2-ULTRA", NV_ARCH_10 },
{ "Quadro2-PRO", NV_ARCH_10 },
{ "TEST",NV_ARCH_20 },
{ "GeForce4-MX-460", NV_ARCH_20 },
{ "GeForce4-MX-440", NV_ARCH_20 },
{ "GeForce4-MX-420", NV_ARCH_20 },
238,6 → 240,8
PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_GEFORCE4_MX_440 },
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_GEFORCE4_MX_420 },
{ PCI_VENDOR_ID_NVIDIA, 0x0182,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_TEST },
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_440_GO,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_GEFORCE4_440_GO },
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_420_GO,
/shark/trunk/drivers/fb/shark_fb26.c
20,7 → 20,7
#include <kernel/kern.h>
 
extern int fbmem_init(void);
extern void fbmem_init(void);
extern int fb_open_inode(int num);
extern int fb_close_inode(int num);
extern int fb_set_mode_inode(int num, int wx, int wy, int bpp);
28,10 → 28,7
/* Init the Linux PCI 2.6 Driver */
int FB26_init() {
 
if (fbmem_init()) {
printk("FB ERROR: Cannot init the FrameBuffer driver\n");
return -1;
}
fbmem_init();
 
return 0;