diff options
| author | Dave Jones <davej@redhat.com> | 2007-02-10 20:36:29 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2007-02-10 20:36:29 -0500 |
| commit | bd0561c9d8dcbf21cd9aa46c416bbf6a3a12e4b1 (patch) | |
| tree | 64fe15d4db42e0840acea00e4cf7e1855bba9e96 /arch/mips/ddb5xxx/common | |
| parent | 348f31ed2bd18391fe5903aa0ad7bfcda6d8ca0b (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
Signed-off-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'arch/mips/ddb5xxx/common')
| -rw-r--r-- | arch/mips/ddb5xxx/common/prom.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/ddb5xxx/common/prom.c b/arch/mips/ddb5xxx/common/prom.c index efef0f57ce1e..54a857b5e3ba 100644 --- a/arch/mips/ddb5xxx/common/prom.c +++ b/arch/mips/ddb5xxx/common/prom.c | |||
| @@ -59,9 +59,8 @@ void __init prom_init(void) | |||
| 59 | #endif | 59 | #endif |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | unsigned long __init prom_free_prom_memory(void) | 62 | void __init prom_free_prom_memory(void) |
| 63 | { | 63 | { |
| 64 | return 0; | ||
| 65 | } | 64 | } |
| 66 | 65 | ||
| 67 | #if defined(CONFIG_DDB5477) | 66 | #if defined(CONFIG_DDB5477) |