diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
| commit | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (patch) | |
| tree | 351a40b72514d620e5bebea2de38c26f23277ffc /arch/mips/kernel/i8259.c | |
| parent | 28df955a2ad484d602314b30183ea8496a9aa34a (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'arch/mips/kernel/i8259.c')
| -rw-r--r-- | arch/mips/kernel/i8259.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c index 2125ba5f1d9b..0cb8ed5662f3 100644 --- a/arch/mips/kernel/i8259.c +++ b/arch/mips/kernel/i8259.c | |||
| @@ -302,11 +302,11 @@ static struct irqaction irq2 = { | |||
| 302 | }; | 302 | }; |
| 303 | 303 | ||
| 304 | static struct resource pic1_io_resource = { | 304 | static struct resource pic1_io_resource = { |
| 305 | "pic1", 0x20, 0x3f, IORESOURCE_BUSY | 305 | .name = "pic1", .start = 0x20, .end = 0x3f, .flags = IORESOURCE_BUSY |
| 306 | }; | 306 | }; |
| 307 | 307 | ||
| 308 | static struct resource pic2_io_resource = { | 308 | static struct resource pic2_io_resource = { |
| 309 | "pic2", 0xa0, 0xbf, IORESOURCE_BUSY | 309 | .name = "pic2", .start = 0xa0, .end = 0xbf, .flags = IORESOURCE_BUSY |
| 310 | }; | 310 | }; |
| 311 | 311 | ||
| 312 | /* | 312 | /* |