diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-16 21:58:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-16 21:58:37 -0400 |
| commit | c970d5a32ae1a90fba89892cc3432cf0b408cb8b (patch) | |
| tree | 1d8c3b5bf21249057efabfbb19abd63960a23a1d /arch/mips/au1000/common/platform.c | |
| parent | 6af74b03e00fc78806f75f6701b24b582bbb5c96 (diff) | |
| parent | da19566552315389370c40e690054a31b7623de5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
it821x: do not describe noraid parameter with its value
Pb1200/DBAu1200: fix bad IDE resource size
Au1200: IDE driver build fix
Au1200: kill IDE driver function prototypes
avr32 mustn't select HAVE_IDE
Diffstat (limited to 'arch/mips/au1000/common/platform.c')
| -rw-r--r-- | arch/mips/au1000/common/platform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/au1000/common/platform.c b/arch/mips/au1000/common/platform.c index 841904cdef4d..39d681265297 100644 --- a/arch/mips/au1000/common/platform.c +++ b/arch/mips/au1000/common/platform.c | |||
| @@ -189,7 +189,7 @@ static struct resource au1200_lcd_resources[] = { | |||
| 189 | static struct resource au1200_ide0_resources[] = { | 189 | static struct resource au1200_ide0_resources[] = { |
| 190 | [0] = { | 190 | [0] = { |
| 191 | .start = AU1XXX_ATA_PHYS_ADDR, | 191 | .start = AU1XXX_ATA_PHYS_ADDR, |
| 192 | .end = AU1XXX_ATA_PHYS_ADDR + AU1XXX_ATA_PHYS_LEN, | 192 | .end = AU1XXX_ATA_PHYS_ADDR + AU1XXX_ATA_PHYS_LEN - 1, |
| 193 | .flags = IORESOURCE_MEM, | 193 | .flags = IORESOURCE_MEM, |
| 194 | }, | 194 | }, |
| 195 | [1] = { | 195 | [1] = { |