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 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ata
/
pata_cs5536.c
diff --git
a/drivers/ata/pata_cs5536.c
b/drivers/ata/pata_cs5536.c
index 73f8332cb67992ac70d0bad0ba6166017d997ba1..afed92976198079efee3520b63478f706dffee66 100644
(file)
--- a/
drivers/ata/pata_cs5536.c
+++ b/
drivers/ata/pata_cs5536.c
@@
-110,7
+110,6
@@
static inline int cs5536_write(struct pci_dev *pdev, int reg, int val)
/**
* cs5536_cable_detect - detect cable type
* @ap: Port to detect on
- * @deadline: deadline jiffies for the operation
*
* Perform cable detection for ATA66 capable cable. Return a libata
* cable type.