From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 24 May 2010 15:05:29 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
X-Git-Tag: v2.6.35-rc1~409
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=7e125f7b9cbfce4101191b8076d606c517a73066;hp=-c

Merge git://git./linux/kernel/git/davem/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
  cmd640: fix kernel oops in test_irq() method
  pdc202xx_old: ignore "FIFO empty" bit in test_irq() method
  pdc202xx_old: wire test_irq() method for PDC2026x
  IDE: pass IRQ flags to the IDE core
  ide: fix comment typo in ide.h
---

7e125f7b9cbfce4101191b8076d606c517a73066
diff --combined include/linux/ide.h
index b6d448048ae2,5acdbe51348a..7b02aa5ce9b4
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@@ -362,7 -362,7 +362,7 @@@ struct ide_drive_s
  struct ide_disk_ops {
  	int		(*check)(struct ide_drive_s *, const char *);
  	int		(*get_capacity)(struct ide_drive_s *);
 -	u64		(*set_capacity)(struct ide_drive_s *, u64);
 +	void		(*unlock_native_capacity)(struct ide_drive_s *);
  	void		(*setup)(struct ide_drive_s *);
  	void		(*flush)(struct ide_drive_s *);
  	int		(*init_media)(struct ide_drive_s *, struct gendisk *);
@@@ -516,8 -516,8 +516,8 @@@ struct ide_drive_s 
          u8	current_speed;	/* current transfer rate set */
  	u8	desired_speed;	/* desired transfer rate set */
  	u8	pio_mode;	/* for ->set_pio_mode _only_ */
- 	u8	dma_mode;	/* for ->dma_pio_mode _only_ */
-         u8	dn;		/* now wide spread use */
+ 	u8	dma_mode;	/* for ->set_dma_mode _only_ */
+ 	u8	dn;		/* now wide spread use */
  	u8	acoustic;	/* acoustic management */
  	u8	media;		/* disk, cdrom, tape, floppy, ... */
  	u8	ready_stat;	/* min status value for drive ready */