diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-05-28 19:10:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-05-28 19:10:12 -0700 |
| commit | 18c16b3368c0cdfd35255243af2a93aac274ac9a (patch) | |
| tree | 9ce59682b45512a8d439efb4572b519889bdffa3 /include | |
| parent | bd7c535870da5a8c957625bcd2f7e6fa688b4e13 (diff) | |
| parent | f1c83c72e38afc861f8ebf3430c347f9778d541c (diff) | |
Merge http://linux-isdn.bkbits.net/linux-2.5.make-drivers
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/hw_irq.h | 1 | ||||
| -rw-r--r-- | include/linux/blkdev.h | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/include/asm-i386/hw_irq.h b/include/asm-i386/hw_irq.h index 8e20a941e5a9..aad2d80cefff 100644 --- a/include/asm-i386/hw_irq.h +++ b/include/asm-i386/hw_irq.h @@ -28,6 +28,7 @@ extern int irq_vector[NR_IRQS]; extern void (*interrupt[NR_IRQS])(void); +extern asmlinkage void thermal_interrupt(void); extern asmlinkage void smp_thermal_interrupt(struct pt_regs); #ifdef CONFIG_SMP diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index b9972fe4fc70..407b176d7dad 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -8,7 +8,6 @@ #include <linux/list.h> #include <linux/pagemap.h> #include <linux/backing-dev.h> -#include <linux/interrupt.h> #include <asm/scatterlist.h> @@ -137,11 +136,6 @@ struct blk_queue_tag { int max_depth; }; -struct blk_plug { - struct list_head list; - struct tasklet_struct task; -}; - /* * Default nr free requests per queue, ll_rw_blk will scale it down * according to available RAM at init time @@ -183,7 +177,7 @@ struct request_queue unsigned long bounce_pfn; int bounce_gfp; - struct blk_plug plug; + struct list_head plug_list; /* * various queue flags, see QUEUE_* below |