rpms/kernel/devel linux-2.6.12rc-ac-ide-fixes.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28301

Modified Files:
	linux-2.6.12rc-ac-ide-fixes.patch 
Log Message:
bogus bit.


linux-2.6.12rc-ac-ide-fixes.patch:
 drivers/cdrom/cdrom.c          |    3 
 drivers/ide/Kconfig            |   13 
 drivers/ide/Makefile           |    2 
 drivers/ide/arm/icside.c       |    6 
 drivers/ide/cris/ide-v10.c     |    6 
 drivers/ide/ide-cd.c           |  132 +++++-
 drivers/ide/ide-default.c      |  256 ++++++++++++
 drivers/ide/ide-disk.c         |   58 ++
 drivers/ide/ide-dma.c          |   13 
 drivers/ide/ide-floppy.c       |   16 
 drivers/ide/ide-io.c           |   65 +++
 drivers/ide/ide-iops.c         |  165 +++++---
 drivers/ide/ide-pnp.c          |    7 
 drivers/ide/ide-probe.c        |    5 
 drivers/ide/ide-proc.c         |  176 +++++---
 drivers/ide/ide-tape.c         |   16 
 drivers/ide/ide-taskfile.c     |   12 
 drivers/ide/ide.c              |  489 +++++++++++++++++++-----
 drivers/ide/legacy/ide-cs.c    |   28 -
 drivers/ide/pci/Makefile       |    2 
 drivers/ide/pci/alim15x3.c     |    2 
 drivers/ide/pci/cs5520.c       |   11 
 drivers/ide/pci/delkin_cb.c    |  140 +++++++
 drivers/ide/pci/generic.c      |   86 +++-
 drivers/ide/pci/hpt366.c       |  474 +++++++++++------------
 drivers/ide/pci/it821x.c       |  812 +++++++++++++++++++++++++++++++++++++++++
 drivers/ide/pci/ns87415.c      |    2 
 drivers/ide/pci/pdc202xx_old.c |    2 
 drivers/ide/pci/sgiioc4.c      |    4 
 drivers/ide/pci/siimage.c      |    8 
 drivers/ide/pci/sl82c105.c     |    2 
 drivers/ide/pci/trm290.c       |    7 
 drivers/ide/ppc/pmac.c         |    6 
 drivers/ide/setup-pci.c        |   83 ++++
 drivers/macintosh/mediabay.c   |    5 
 drivers/scsi/ide-scsi.c        |    4 
 drivers/scsi/nsp32.h           |    1 
 include/asm-i386/ide.h         |   14 
 include/linux/ide.h            |   47 +-
 include/linux/pci_ids.h        |    6 
 40 files changed, 2560 insertions(+), 626 deletions(-)

Index: linux-2.6.12rc-ac-ide-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.12rc-ac-ide-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.12rc-ac-ide-fixes.patch	30 Apr 2005 19:32:24 -0000	1.1
+++ linux-2.6.12rc-ac-ide-fixes.patch	30 Apr 2005 19:35:34 -0000	1.2
@@ -5262,18 +5262,6 @@
  extern int probe_hwif_init(ide_hwif_t *);
  
  static inline void *ide_get_hwifdata (ide_hwif_t * hwif)
-diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/include/linux/irq.h linux-2.6.12rc3/include/linux/irq.h
---- linux.vanilla-2.6.12rc3/include/linux/irq.h	2005-04-27 15:59:49.000000000 +0100
-+++ linux-2.6.12rc3/include/linux/irq.h	2005-04-27 16:22:06.000000000 +0100
-@@ -83,7 +83,7 @@
- extern fastcall int handle_IRQ_event(unsigned int irq, struct pt_regs *regs,
- 				       struct irqaction *action);
- extern fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs);
--extern void note_interrupt(unsigned int irq, irq_desc_t *desc, int action_ret);
-+extern void note_interrupt(unsigned int irq, irq_desc_t *desc, int action_ret, struct pt_regs *regs);
- extern void report_bad_irq(unsigned int irq, irq_desc_t *desc, int action_ret);
- extern int can_request_irq(unsigned int irq, unsigned long irqflags);
- 
 diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/scsi/nsp32.h linux-2.6.12rc3/drivers/scsi/nsp32.h
 --- linux.vanilla-2.6.12rc3/drivers/scsi/nsp32.h	2005-04-27 15:59:38.000000000 +0100
 +++ linux-2.6.12rc3/drivers/scsi/nsp32.h	2005-04-27 16:19:52.000000000 +0100