Merge branch 'upstream'

#include <asm/io.h>

#define DRV_NAME	"ahci"

#define DRV_VERSION	"1.2"

#define DRV_VERSION	"1.3"

enum {

#include <linux/libata.h>

#define DRV_NAME	"ata_piix"

#define DRV_VERSION	"1.05"

#define DRV_VERSION	"1.10"

enum {

	PIIX_IOCFG		= 0x54, /* IDE I/O configuration register */

#define __LIBATA_H__

#define DRV_NAME	"libata"

#define DRV_VERSION	"1.20"	/* must be exactly four chars */

#define DRV_VERSION	"1.30"	/* must be exactly four chars */

struct ata_scsi_args {

	struct ata_port		*ap;

#include <linux/libata.h>

#define DRV_NAME	"pdc_adma"

#define DRV_VERSION	"0.03"

#define DRV_VERSION	"0.04"

/* macro to calculate base address for ATA regs */

#define ADMA_ATA_REGS(base,port_no)	((base) + ((port_no) * 0x40))

#include <linux/libata.h>

#define DRV_NAME			"sata_nv"

#define DRV_VERSION			"0.8"

#define DRV_VERSION			"0.9"

enum {

	NV_PORTS			= 2,