diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-18 09:29:59 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-18 09:29:59 -0700 |
commit | e0a9272c616838109fc5988ab154dc10670eb15e (patch) | |
tree | 9872ba66ec61b85bd2f0d1f793cdea5131b861cd | |
parent | 76835b0ebf8a7fe85beb03c75121419a7dec52f0 (diff) | |
parent | 7546e52b5e3d46d0deae4a336252b6dfd52c6571 (diff) | |
download | op-kernel-dev-e0a9272c616838109fc5988ab154dc10670eb15e.zip op-kernel-dev-e0a9272c616838109fc5988ab154dc10670eb15e.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Pull IDE cleanup from David Miller:
"One IDE driver cleanup"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
Drivers: ide: Remove typedef atiixp_ide_timing
-rw-r--r-- | drivers/ide/atiixp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/atiixp.c b/drivers/ide/atiixp.c index dbd0f24..76650e9 100644 --- a/drivers/ide/atiixp.c +++ b/drivers/ide/atiixp.c @@ -19,12 +19,12 @@ #define ATIIXP_IDE_UDMA_CONTROL 0x54 #define ATIIXP_IDE_UDMA_MODE 0x56 -typedef struct { +struct atiixp_ide_timing { u8 command_width; u8 recover_width; -} atiixp_ide_timing; +}; -static atiixp_ide_timing pio_timing[] = { +static struct atiixp_ide_timing pio_timing[] = { { 0x05, 0x0d }, { 0x04, 0x07 }, { 0x03, 0x04 }, @@ -32,7 +32,7 @@ static atiixp_ide_timing pio_timing[] = { { 0x02, 0x00 }, }; -static atiixp_ide_timing mdma_timing[] = { +static struct atiixp_ide_timing mdma_timing[] = { { 0x07, 0x07 }, { 0x02, 0x01 }, { 0x02, 0x00 }, |