diff options
| author |   David Woodhouse <dwmw2@infradead.org> | 2006-01-14 00:13:49 +0000 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2006-01-14 13:19:18 +1100 |
| commit | 575e321606c5673efabf28c0fa075e198980c44e (patch) | |
| tree | 0d9f9c1a78946aca34af74f701dc3f7cf251e47a /arch/powerpc/platforms/chrp/time.c | |
| parent | [PATCH] powerpc: special-case ibm,suspend-me RTAS call (diff) | |
| download | linux-dev-575e321606c5673efabf28c0fa075e198980c44e.tar.xz linux-dev-575e321606c5673efabf28c0fa075e198980c44e.zip | |
[PATCH] powerpc: Make CHRP build again
This makes CHRP build again, although it's untested because my Pegasos
is currently in pieces.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to '')
| -rw-r--r-- | arch/powerpc/platforms/chrp/time.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/chrp/time.c b/arch/powerpc/platforms/chrp/time.c index 737ee5d9f0aa..36a0f97bb7b1 100644 --- a/arch/powerpc/platforms/chrp/time.c +++ b/arch/powerpc/platforms/chrp/time.c @@ -21,6 +21,7 @@ #include <linux/mc146818rtc.h> #include <linux/init.h> #include <linux/bcd.h> +#include <linux/ioport.h> #include <asm/io.h> #include <asm/nvram.h> @@ -37,14 +38,16 @@ static int nvram_data = NVRAM_DATA; long __init chrp_time_init(void) { struct device_node *rtcs; + struct resource r; int base; rtcs = find_compatible_devices("rtc", "pnpPNP,b00"); if (rtcs == NULL) rtcs = find_compatible_devices("rtc", "ds1385-rtc"); - if (rtcs == NULL || rtcs->addrs == NULL) + if (rtcs == NULL || of_address_to_resource(rtcs, 0, &r)) return 0; - base = rtcs->addrs[0].address; + + base = r.start; nvram_as1 = 0; nvram_as0 = base; nvram_data = base + 1; |