diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2003-09-01 04:25:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-09-01 04:25:27 -0700 |
| commit | 054cb79567437ca10de7bdfa14131c558df98819 (patch) | |
| tree | 57adb77d0efcf2fbd8b5125919a7efbfebd8fa4d /include | |
| parent | 57d435d42893d4bc17d33d479a9b57f9ef0e0d38 (diff) | |
| parent | d4ad7a7c3d26884d54c52b01c1d461a03679aa09 (diff) | |
Merge bk://kernel.bkbits.net/jgarzik/net-drivers-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-m68knommu/irq.h | 7 | ||||
| -rw-r--r-- | include/asm-m68knommu/local.h | 6 | ||||
| -rw-r--r-- | include/asm-m68knommu/sections.h | 7 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
4 files changed, 20 insertions, 3 deletions
diff --git a/include/asm-m68knommu/irq.h b/include/asm-m68knommu/irq.h index 02345b308049..c463354e6d3d 100644 --- a/include/asm-m68knommu/irq.h +++ b/include/asm-m68knommu/irq.h @@ -2,6 +2,7 @@ #define _M68K_IRQ_H_ #include <linux/config.h> +#include <linux/interrupt.h> #include <asm/ptrace.h> #ifdef CONFIG_COLDFIRE @@ -62,7 +63,7 @@ extern void (*mach_enable_irq)(unsigned int); extern void (*mach_disable_irq)(unsigned int); extern int sys_request_irq(unsigned int, - void (*)(int, void *, struct pt_regs *), + irqreturn_t (*)(int, void *, struct pt_regs *), unsigned long, const char *, void *); extern void sys_free_irq(unsigned int, void *); @@ -91,7 +92,7 @@ extern void sys_free_irq(unsigned int, void *); * interrupt source (if it supports chaining). */ typedef struct irq_node { - void (*handler)(int, void *, struct pt_regs *); + irqreturn_t (*handler)(int, void *, struct pt_regs *); unsigned long flags; void *dev_id; const char *devname; @@ -102,7 +103,7 @@ typedef struct irq_node { * This structure has only 4 elements for speed reasons */ typedef struct irq_handler { - void (*handler)(int, void *, struct pt_regs *); + irqreturn_t (*handler)(int, void *, struct pt_regs *); unsigned long flags; void *dev_id; const char *devname; diff --git a/include/asm-m68knommu/local.h b/include/asm-m68knommu/local.h new file mode 100644 index 000000000000..84a39c1b86f8 --- /dev/null +++ b/include/asm-m68knommu/local.h @@ -0,0 +1,6 @@ +#ifndef __M68KNOMMU_LOCAL_H +#define __M68KNOMMU_LOCAL_H + +#include <asm-generic/local.h> + +#endif /* __M68KNOMMU_LOCAL_H */ diff --git a/include/asm-m68knommu/sections.h b/include/asm-m68knommu/sections.h new file mode 100644 index 000000000000..dd0ecb98ec08 --- /dev/null +++ b/include/asm-m68knommu/sections.h @@ -0,0 +1,7 @@ +#ifndef _M68KNOMMU_SECTIONS_H +#define _M68KNOMMU_SECTIONS_H + +/* nothing to see, move along */ +#include <asm-generic/sections.h> + +#endif diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index b6bd22855121..4fc931b4e76f 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1345,7 +1345,10 @@ #define PCI_VENDOR_ID_TOSHIBA 0x1179 #define PCI_DEVICE_ID_TOSHIBA_601 0x0601 #define PCI_DEVICE_ID_TOSHIBA_TOPIC95 0x060a +#define PCI_DEVICE_ID_TOSHIBA_TOPIC95_A 0x0603 +#define PCI_DEVICE_ID_TOSHIBA_TOPIC95_B 0x060a #define PCI_DEVICE_ID_TOSHIBA_TOPIC97 0x060f +#define PCI_DEVICE_ID_TOSHIBA_TOPIC100 0x0617 #define PCI_VENDOR_ID_TOSHIBA_2 0x102f #define PCI_DEVICE_ID_TOSHIBA_TX3927 0x000a |