diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-11-12 08:43:22 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-11-12 08:43:22 +1100 |
| commit | 486936cd93e99c802153b3f2f629c5ce62b8c0d4 (patch) | |
| tree | 51e261a96e1fb6b51d4a6afb92bfc2480e150b6c /drivers/ata/pata_cs5535.c | |
| parent | 1c1b777a5673b57a6c0377ba60a790d05e4a0676 (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
Merge branch 'linux-2.6' into next
Diffstat (limited to 'drivers/ata/pata_cs5535.c')
| -rw-r--r-- | drivers/ata/pata_cs5535.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c index 1b2d4a0f5f7..8b236af84c2 100644 --- a/drivers/ata/pata_cs5535.c +++ b/drivers/ata/pata_cs5535.c @@ -72,7 +72,6 @@ /** * cs5535_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. |