projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[powerpc.git]
/
drivers
/
ata
/
sata_qstor.c
diff --git
a/drivers/ata/sata_qstor.c
b/drivers/ata/sata_qstor.c
index
6097d8f
..
8786b45
100644
(file)
--- a/
drivers/ata/sata_qstor.c
+++ b/
drivers/ata/sata_qstor.c
@@
-39,7
+39,7
@@
#include <linux/libata.h>
#define DRV_NAME "sata_qstor"
#include <linux/libata.h>
#define DRV_NAME "sata_qstor"
-#define DRV_VERSION "0.0
6
"
+#define DRV_VERSION "0.0
7
"
enum {
QS_MMIO_BAR = 4,
enum {
QS_MMIO_BAR = 4,
@@
-446,7
+446,7
@@
static inline unsigned int qs_intr_mmio(struct ata_host *host)
if ((status & ATA_BUSY))
continue;
DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n",
if ((status & ATA_BUSY))
continue;
DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n",
- ap->id, qc->tf.protocol, status);
+ ap->
print_
id, qc->tf.protocol, status);
/* complete taskfile transaction */
pp->state = qs_state_idle;
/* complete taskfile transaction */
pp->state = qs_state_idle;