projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ata
/
pata_sis.c
diff --git
a/drivers/ata/pata_sis.c
b/drivers/ata/pata_sis.c
index 60cea13cccce9485b01ff73f6ff40a76821c23be..c04abc393fc5276461fe39b50fd4f2766343f687 100644
(file)
--- a/
drivers/ata/pata_sis.c
+++ b/
drivers/ata/pata_sis.c
@@
-593,7
+593,7
@@
static const struct ata_port_info sis_info133 = {
.port_ops = &sis_133_ops,
};
const struct ata_port_info sis_info133_for_sata = {
- .flags = ATA_FLAG_SLAVE_POSS
| ATA_FLAG_SRST
,
+ .flags = ATA_FLAG_SLAVE_POSS,
.pio_mask = ATA_PIO4,
/* No MWDMA */
.udma_mask = ATA_UDMA6,