diff options
| author | David S. Miller <davem@kernel.bkbits.net> | 2004-07-01 07:12:53 -0700 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2004-07-01 07:12:53 -0700 |
| commit | bf5c4064091ffbdc2a958f7c3cbff0b400382e63 (patch) | |
| tree | d68f8042e426154b21db76be09fa98938cf39149 /include/linux | |
| parent | 90d90ae3132f22bf526745d913c41448250165e3 (diff) | |
| parent | fbd7fa39d68c3828f324e556e3f61e462282021c (diff) | |
Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6
into kernel.bkbits.net:/home/davem/net-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/init_task.h | 2 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 29189706ea57..9937c8df8d7c 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h @@ -54,7 +54,7 @@ #define INIT_SIGHAND(sighand) { \ .count = ATOMIC_INIT(1), \ - .action = { {{0,}}, }, \ + .action = { {{NULL,}}, }, \ .siglock = SPIN_LOCK_UNLOCKED, \ } diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 2299b75b0518..0a73d0d2c271 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1176,7 +1176,8 @@ #define PCI_DEVICE_ID_VIA_8763_0 0x0198 #define PCI_DEVICE_ID_VIA_8380_0 0x0204 #define PCI_DEVICE_ID_VIA_PX8X0_0 0x0259 -#define PCI_DEVICE_ID_VIA_8363_0 0x0305 +#define PCI_DEVICE_ID_VIA_K8T800PRO_0 0x0282 +#define PCI_DEVICE_ID_VIA_8363_0 0x0305 #define PCI_DEVICE_ID_VIA_8371_0 0x0391 #define PCI_DEVICE_ID_VIA_8501_0 0x0501 #define PCI_DEVICE_ID_VIA_82C505 0x0505 |