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/jazz/setup.c | |
| parent | 28df955a2ad484d602314b30183ea8496a9aa34a (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'arch/mips/jazz/setup.c')
| -rw-r--r-- | arch/mips/jazz/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c index 4036dc434551..c8d0df7d0c36 100644 --- a/arch/mips/jazz/setup.c +++ b/arch/mips/jazz/setup.c | |||
| @@ -52,7 +52,7 @@ static struct resource jazz_io_resources[] = { | |||
| 52 | { "dma2", 0xc0, 0xdf, IORESOURCE_BUSY }, | 52 | { "dma2", 0xc0, 0xdf, IORESOURCE_BUSY }, |
| 53 | }; | 53 | }; |
| 54 | 54 | ||
| 55 | void __init plat_setup(void) | 55 | void __init plat_mem_setup(void) |
| 56 | { | 56 | { |
| 57 | int i; | 57 | int i; |
| 58 | 58 | ||