From 8bb277076c5e65fef474380eb43735da7d0b2e3b Mon Sep 17 00:00:00 2001 From: Daniel Ritz Date: Wed, 27 Aug 2003 23:21:15 +0100 Subject: [PCMCIA] Add ToPIC97 and ToPIC100 support. Patch from Daniel Ritz. Add zoom video support for tosiba ToPIC97 and ToPIC100 chips. --- include/linux/pci_ids.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 6dc3a4d10bcc..7b1cb65837d0 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1332,7 +1332,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 -- cgit v1.3 From 7eaf8cd58588a84d248e5516e133caa7a46b20b5 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Mon, 1 Sep 2003 03:38:09 -0700 Subject: [PATCH] irqreturn_t fixes for m68knommu irq.h --- include/asm-m68knommu/irq.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'include') 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 +#include #include #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; -- cgit v1.3 From 6a7f06eb84c19551da99e725c1f7ec325531bcdd Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Mon, 1 Sep 2003 03:38:17 -0700 Subject: [PATCH] create an m68knommu local.h This patch creates a local.h for the m68knommu arhcitecture. Like most others architectures it is just an include of the generic one. --- include/asm-m68knommu/local.h | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 include/asm-m68knommu/local.h (limited to 'include') 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 + +#endif /* __M68KNOMMU_LOCAL_H */ -- cgit v1.3 From ecb35a686eb6b397213559a1e0dcdcfb6dd4300d Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Mon, 1 Sep 2003 03:38:26 -0700 Subject: [PATCH] create an m68knommu sections.h This patch creates a sections.h for the m68knommu architecture. Nothing special needed, just an include of the generic code. --- include/asm-m68knommu/sections.h | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 include/asm-m68knommu/sections.h (limited to 'include') 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 + +#endif -- cgit v1.3