merge

diff --cc drivers/char/watchdog/wdt_pci.c
Simple merge

diff --cc drivers/net/3c59x.c
Simple merge

diff --cc drivers/net/wan/dscc4.c
Simple merge

diff --cc drivers/net/wan/pc300_drv.c
Simple merge

diff --cc drivers/video/i810/i810_main.h
index 18b29a0b3227391149e90a0d57afce6639d05a3d,43a070f61ee89f0adac46316d766c79aa2cd3407..57e81009d7b451f1431f7439a6c83a4c874b0a1e
--- 1/drivers/video/i810/i810_main.h
--- 2/drivers/video/i810/i810_main.h
+++ b/drivers/video/i810/i810_main.h
@@@ -14,6 -14,32 +14,22 @@@
  #ifndef __I810_MAIN_H__
  #define __I810_MAIN_H__
  
 -/* PCI */
 -static const char *i810_pci_list[] __initdata = {
 -      "Intel(R) 810 Framebuffer Device"                                 ,
 -      "Intel(R) 810-DC100 Framebuffer Device"                           ,
 -      "Intel(R) 810E Framebuffer Device"                                ,
 -      "Intel(R) 815 (Internal Graphics 100Mhz FSB) Framebuffer Device"  ,
 -      "Intel(R) 815 (Internal Graphics only) Framebuffer Device"        , 
 -      "Intel(R) 815 (Internal Graphics with AGP) Framebuffer Device"  
 -};
 -
+ static struct pci_device_id i810fb_pci_tbl[] = {
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82810_IG1, 
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, 
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82810_IG3,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1  },
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82810E_IG,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 },
+       /* mvo: added i815 PCI-ID */  
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_100,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3 },
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_NOAGP,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 }
+ };      
+                    
  static int  __init i810fb_init_pci (struct pci_dev *dev, 
                                       const struct pci_device_id *entry);
  static void __exit i810fb_remove_pci(struct pci_dev *dev);