Commit cebb7f74 authored by Linus Torvalds's avatar Linus Torvalds

Automerge

parents e9df2323 8313b771
...@@ -70,6 +70,9 @@ Driver details: ...@@ -70,6 +70,9 @@ Driver details:
Change history: Change history:
Version 0.9.8:
* Support other i8xx chipsets by adding 82801E detection
Version 0.9.7: Version 0.9.7:
* Support other i8xx chipsets too (by adding 82801BA(M) and * Support other i8xx chipsets too (by adding 82801BA(M) and
82801CA(M) detection) 82801CA(M) detection)
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
/* /*
* core module and version information * core module and version information
*/ */
#define RNG_VERSION "0.9.7" #define RNG_VERSION "0.9.8"
#define RNG_MODULE_NAME "i810_rng" #define RNG_MODULE_NAME "i810_rng"
#define RNG_DRIVER_NAME RNG_MODULE_NAME " hardware driver " RNG_VERSION #define RNG_DRIVER_NAME RNG_MODULE_NAME " hardware driver " RNG_VERSION
#define PFX RNG_MODULE_NAME ": " #define PFX RNG_MODULE_NAME ": "
...@@ -336,6 +336,7 @@ static struct pci_device_id rng_pci_tbl[] __initdata = { ...@@ -336,6 +336,7 @@ static struct pci_device_id rng_pci_tbl[] __initdata = {
{ 0x8086, 0x2428, PCI_ANY_ID, PCI_ANY_ID, }, { 0x8086, 0x2428, PCI_ANY_ID, PCI_ANY_ID, },
{ 0x8086, 0x2448, PCI_ANY_ID, PCI_ANY_ID, }, { 0x8086, 0x2448, PCI_ANY_ID, PCI_ANY_ID, },
{ 0x8086, 0x244e, PCI_ANY_ID, PCI_ANY_ID, }, { 0x8086, 0x244e, PCI_ANY_ID, PCI_ANY_ID, },
{ 0x8086, 0x245e, PCI_ANY_ID, PCI_ANY_ID, },
{ 0, }, { 0, },
}; };
MODULE_DEVICE_TABLE (pci, rng_pci_tbl); MODULE_DEVICE_TABLE (pci, rng_pci_tbl);
......
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