diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 13:35:57 +0100 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 13:35:57 +0100 |
| commit | 2ca1a615835d9f4990f42102ab1f2ef434e7e89c (patch) | |
| tree | 726cf3d5f29a6c66c44e4bd68e7ebed2fd83d059 /drivers/media/video/cx18/cx18-irq.h | |
| parent | cpumask: Use nr_cpu_ids in seq_cpumask (diff) | |
| parent | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (diff) | |
| download | linux-2ca1a615835d9f4990f42102ab1f2ef434e7e89c.tar.xz linux-2ca1a615835d9f4990f42102ab1f2ef434e7e89c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/x86/kernel/io_apic.c
Diffstat (limited to 'drivers/media/video/cx18/cx18-irq.h')
| -rw-r--r-- | drivers/media/video/cx18/cx18-irq.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx18/cx18-irq.h b/drivers/media/video/cx18/cx18-irq.h index 6173ca3bc9e4..91f0b5278ef9 100644 --- a/drivers/media/video/cx18/cx18-irq.h +++ b/drivers/media/video/cx18/cx18-irq.h @@ -2,6 +2,7 @@ * cx18 interrupt handling * * Copyright (C) 2007 Hans Verkuil <hverkuil@xs4all.nl> + * Copyright (C) 2008 Andy Walls <awalls@radix.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,8 +29,7 @@ #define SW1_INT_ENABLE_PCI 0xc7311c #define SW2_INT_SET 0xc73140 #define SW2_INT_STATUS 0xc73144 +#define SW2_INT_ENABLE_CPU 0xc73158 #define SW2_INT_ENABLE_PCI 0xc7315c irqreturn_t cx18_irq_handler(int irq, void *dev_id); - -void cx18_work_handler(struct work_struct *work); |