diff options
| author | Roland Dreier <roland@eddore.topspincom.com> | 2005-07-28 02:12:56 (GMT) |
|---|---|---|
| committer | Roland Dreier <roland@eddore.topspincom.com> | 2005-07-28 02:12:56 (GMT) |
| commit | 2868bd281fef21d1e73d6b7648a41efc3d75f10c (patch) | |
| tree | 0ad821cfcc9e3f9e8b662d026bec6bb6d4ce69ac /drivers/ide/pci | |
| parent | 6d376756f2cf3478d5a4fdb8d18e958948366b9d (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
| download | linux-fsl-qoriq-2868bd281fef21d1e73d6b7648a41efc3d75f10c.tar.xz | |
Merge /scratch/Ksrc/linux-git/
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 92a2b7c..11d035f 100644 --- a/drivers/ide/pci/cmd640.c +++ b/drivers/ide/pci/cmd640.c @@ -487,7 +487,7 @@ static void display_clocks (unsigned int index) * Pack active and recovery counts into single byte representation * used by controller */ -inline static u8 pack_nibbles (u8 upper, u8 lower) +static inline u8 pack_nibbles (u8 upper, u8 lower) { return ((upper & 0x0f) << 4) | (lower & 0x0f); } diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c index 8b5eea5..c26c8ca 100644 --- a/drivers/ide/pci/trm290.c +++ b/drivers/ide/pci/trm290.c @@ -5,7 +5,7 @@ * May be copied or modified under the terms of the GNU General Public License * * June 22, 2004 - get rid of check_region - * Jesper Juhl <juhl-lkml@dif.dk> + * - Jesper Juhl * */ |