projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mvebu-fixes-3.17' of git://git.infradead.org/linux-mvebu into next/fixes...
[cascardo/linux.git]
/
drivers
/
ata
/
pata_samsung_cf.c
diff --git
a/drivers/ata/pata_samsung_cf.c
b/drivers/ata/pata_samsung_cf.c
index
2578fc1
..
1a24a5d
100644
(file)
--- a/
drivers/ata/pata_samsung_cf.c
+++ b/
drivers/ata/pata_samsung_cf.c
@@
-360,7
+360,7
@@
static int pata_s3c_wait_after_reset(struct ata_link *link,
/*
* pata_s3c_bus_softreset - PATA device software reset
*/
-static
unsigned
int pata_s3c_bus_softreset(struct ata_port *ap,
+static int pata_s3c_bus_softreset(struct ata_port *ap,
unsigned long deadline)
{
struct ata_ioports *ioaddr = &ap->ioaddr;