Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[~andy/linux] / arch / alpha / kernel / sys_nautilus.c

diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c
index 1383f8601a93b7595b290f7ad595f061917c180b..1d4aabfcf9a160318fd790bd22d98646c270bd74 100644 (file)
--- a/arch/alpha/kernel/sys_nautilus.c
+++ b/arch/alpha/kernel/sys_nautilus.c
@@ -185,7 +185,6 @@ nautilus_machine_check(unsigned long vector, unsigned long la_ptr)
        mb();
 }
 
-extern void free_reserved_mem(void *, void *);
 extern void pcibios_claim_one_bus(struct pci_bus *);
 
 static struct resource irongate_io = {
@@ -239,8 +238,8 @@ nautilus_init_pci(void)
        if (pci_mem < memtop)
                memtop = pci_mem;
        if (memtop > alpha_mv.min_mem_address) {
-               free_reserved_mem(__va(alpha_mv.min_mem_address),
-                                 __va(memtop));
+               free_reserved_area((unsigned long)__va(alpha_mv.min_mem_address),
+                                  (unsigned long)__va(memtop), 0, NULL);
                printk("nautilus_init_pci: %ldk freed\n",
                        (memtop - alpha_mv.min_mem_address) >> 10);
        }