diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-30 18:14:15 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-30 18:14:15 -0400 |
| commit | a670fcb43f01a67ef56176afc76e5d43d128b25c (patch) | |
| tree | 09c9411c78a33ff980e9ea871bc7686e7589abbf /drivers/ide/pci | |
| parent | 327309e899662b482c58cf25f574513d38b5788c (diff) | |
| parent | b0825488a642cadcf39709961dde61440cb0731c (diff) | |
/spare/repo/netdev-2.6 branch 'master'
Diffstat (limited to 'drivers/ide/pci')
| -rw-r--r-- | drivers/ide/pci/cmd640.c | 2 | ||||
| -rw-r--r-- | drivers/ide/pci/trm290.c | 2 |
2 files changed, 2 insertions, 2 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 | } |
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c index 8b5eea5405ef..c26c8ca90dd4 100644 --- a/drivers/ide/pci/trm290.c +++ b/drivers/ide/pci/trm290.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * May be copied or modified under the terms of the GNU General Public License | 5 | * May be copied or modified under the terms of the GNU General Public License |
| 6 | * | 6 | * |
| 7 | * June 22, 2004 - get rid of check_region | 7 | * June 22, 2004 - get rid of check_region |
| 8 | * Jesper Juhl <juhl-lkml@dif.dk> | 8 | * - Jesper Juhl |
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||