diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2004-07-01 12:55:05 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2004-07-01 12:55:05 +0100 |
| commit | 12db213604c53e19ae2d03c91fa13be2487fc1b0 (patch) | |
| tree | 7d3e7b66b71c074c3b274c91174a39fd6f0aee42 /include | |
| parent | 3f4ab37c4786bc196abfbae917be0efcda518454 (diff) | |
| parent | 33761bdbcb93c22a0708abe25a197e2d6cf830a5 (diff) | |
Merge cantab.net:/home/src/bklinux-2.6
into cantab.net:/home/src/ntfs-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-omap/pm.h | 3 | ||||
| -rw-r--r-- | include/linux/init_task.h | 2 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/include/asm-arm/arch-omap/pm.h b/include/asm-arm/arch-omap/pm.h index 2976b46c3a3d..83911b919b2a 100644 --- a/include/asm-arm/arch-omap/pm.h +++ b/include/asm-arm/arch-omap/pm.h @@ -85,9 +85,6 @@ extern void omap_pm_idle(void); extern void omap_pm_suspend(void); extern int omap_cpu_suspend(unsigned short, unsigned short); extern int omap_idle_loop_suspend(void); -extern struct async_struct *omap_pm_sercons; -extern unsigned int serial_in(struct async_struct *, int); -extern unsigned int serial_out(struct async_struct *, int, int); #ifdef CONFIG_ARCH_OMAP1510 #define OMAP_SRAM_IDLE_SUSPEND 0xd002F000 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 |