diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-17 00:51:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-17 00:51:31 -0400 |
| commit | a2e30e529a48ef4e106e405f91cf4ae525bb01c4 (patch) | |
| tree | 2def96ef17c0672c30f1a10287552978bf1d0b1c /drivers/ide/pci/cmd640.c | |
| parent | edb3366703224d5d8df573ae698ccd6b488dc743 (diff) | |
| parent | 2ad56496627630ebc99f06af5f81ca23e17e014e (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/ide/pci/cmd640.c')
| -rw-r--r-- | drivers/ide/pci/cmd640.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c index 92a2b7caed58..11d035f1983d 100644 --- a/drivers/ide/pci/cmd640.c +++ b/drivers/ide/pci/cmd640.c | |||
| @@ -487,7 +487,7 @@ static void display_clocks (unsigned int index) | |||
| 487 | * Pack active and recovery counts into single byte representation | 487 | * Pack active and recovery counts into single byte representation |
| 488 | * used by controller | 488 | * used by controller |
| 489 | */ | 489 | */ |
| 490 | inline static u8 pack_nibbles (u8 upper, u8 lower) | 490 | static inline u8 pack_nibbles (u8 upper, u8 lower) |
| 491 | { | 491 | { |
| 492 | return ((upper & 0x0f) << 4) | (lower & 0x0f); | 492 | return ((upper & 0x0f) << 4) | (lower & 0x0f); |
| 493 | } | 493 | } |