From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 12 Jul 2007 20:40:57 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
X-Git-Tag: v2.6.23-rc1~1106
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=21ba0f88ae56da82a3a15fe54d729208b64c4f4b;p=linux-2.6-omap-h63xx.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (34 commits)
  PCI: Only build PCI syscalls on architectures that want them
  PCI: limit pci_get_bus_and_slot to domain 0
  PCI: hotplug: acpiphp: avoid acpiphp "cannot get bridge info" PCI hotplug failure
  PCI: hotplug: acpiphp: remove hot plug parameter write to PCI host bridge
  PCI: hotplug: acpiphp: fix slot poweroff problem on systems without _PS3
  PCI: hotplug: pciehp: wait for 1 second after power off slot
  PCI: pci_set_power_state(): check for PM capabilities earlier
  PCI: cpci_hotplug: Convert to use the kthread API
  PCI: add pci_try_set_mwi
  PCI: pcie: remove SPIN_LOCK_UNLOCKED
  PCI: ROUND_UP macro cleanup in drivers/pci
  PCI: remove pci_dac_dma_... APIs
  PCI: pci-x-pci-express-read-control-interfaces cleanups
  PCI: Fix typo in include/linux/pci.h
  PCI: pci_ids, remove double or more empty lines
  PCI: pci_ids, add atheros and 3com_2 vendors
  PCI: pci_ids, reorder some entries
  PCI: i386: traps, change VENDOR to DEVICE
  PCI: ATM: lanai, change VENDOR to DEVICE
  PCI: Change all drivers to use pci_device->revision
  ...
---

21ba0f88ae56da82a3a15fe54d729208b64c4f4b
diff --cc drivers/ata/sata_mv.c
index 8a77a0ae83a,6dcfc628aab..5d576435fcc
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@@ -2393,11 -2141,9 +2389,9 @@@ static int mv_chip_id(struct ata_host *
  	switch(board_idx) {
  	case chip_5080:
  		hpriv->ops = &mv5xxx_ops;
 -		hp_flags |= MV_HP_50XX;
 +		hp_flags |= MV_HP_GEN_I;
  
- 		switch (rev_id) {
+ 		switch (pdev->revision) {
  		case 0x1:
  			hp_flags |= MV_HP_ERRATA_50XXB0;
  			break;
@@@ -2415,9 -2161,9 +2409,9 @@@
  	case chip_504x:
  	case chip_508x:
  		hpriv->ops = &mv5xxx_ops;
 -		hp_flags |= MV_HP_50XX;
 +		hp_flags |= MV_HP_GEN_I;
  
- 		switch (rev_id) {
+ 		switch (pdev->revision) {
  		case 0x0:
  			hp_flags |= MV_HP_ERRATA_50XXB0;
  			break;
@@@ -2435,9 -2181,8 +2429,9 @@@
  	case chip_604x:
  	case chip_608x:
  		hpriv->ops = &mv6xxx_ops;
 +		hp_flags |= MV_HP_GEN_II;
  
- 		switch (rev_id) {
+ 		switch (pdev->revision) {
  		case 0x7:
  			hp_flags |= MV_HP_ERRATA_60X1B2;
  			break;
@@@ -2455,9 -2200,10 +2449,9 @@@
  	case chip_7042:
  	case chip_6042:
  		hpriv->ops = &mv6xxx_ops;
 -
  		hp_flags |= MV_HP_GEN_IIE;
  
- 		switch (rev_id) {
+ 		switch (pdev->revision) {
  		case 0x0:
  			hp_flags |= MV_HP_ERRATA_XX42A0;
  			break;