diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 10:45:06 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 10:45:06 -0700 |
commit | 7d9ef601ddf0a42d11df3bdaaf28078fd2995eab (patch) | |
tree | bb681d27103850e1882d375ddce04f18cf42d0c7 /drivers/ata/pdc_adma.c | |
parent | 3b42d28b2a04b3c9830eb865288239d45eccc402 (diff) | |
parent | 2a3103ce4357a09c2289405f969acec0edf4398f (diff) | |
download | op-kernel-dev-7d9ef601ddf0a42d11df3bdaaf28078fd2995eab.zip op-kernel-dev-7d9ef601ddf0a42d11df3bdaaf28078fd2995eab.tar.gz |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] Bump driver versions
ata_piix: implement IOCFG bit18 quirk
libata: implement BROKEN_HPA horkage and apply it to affected drives
sata_promise: FastTrack TX4200 is a second-generation chip
pata_marvell: Add more identifiers
ata_piix: add Satellite U200 to broken suspend list
ata: add ATA_MWDMA* and ATA_SWDMA* defines
ata_piix: IDE mode SATA patch for Intel Tolapai
libata-core: Allow translation setting to fail
Diffstat (limited to 'drivers/ata/pdc_adma.c')
-rw-r--r-- | drivers/ata/pdc_adma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c index bec1de5..5c79271 100644 --- a/drivers/ata/pdc_adma.c +++ b/drivers/ata/pdc_adma.c @@ -44,7 +44,7 @@ #include <linux/libata.h> #define DRV_NAME "pdc_adma" -#define DRV_VERSION "0.06" +#define DRV_VERSION "1.0" /* macro to calculate base address for ATA regs */ #define ADMA_ATA_REGS(base,port_no) ((base) + ((port_no) * 0x40)) |