diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 23:32:13 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 23:32:13 -0500 |
commit | fe69102188cde0700cddd8d4cda0b77d68284884 (patch) | |
tree | ae2f88c810ff48f040a808a924585000b52082e9 /include | |
parent | f30ac319f1b91878cdc57a50930f15c36e0e103a (diff) | |
parent | 7d4d61544a12333600bdb9b018a149868418692e (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-powerpc/prom.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h index 5b2bd4eefb01..cbd297f44cce 100644 --- a/include/asm-powerpc/prom.h +++ b/include/asm-powerpc/prom.h | |||
@@ -222,5 +222,7 @@ extern int of_address_to_resource(struct device_node *dev, int index, | |||
222 | extern int of_pci_address_to_resource(struct device_node *dev, int bar, | 222 | extern int of_pci_address_to_resource(struct device_node *dev, int bar, |
223 | struct resource *r); | 223 | struct resource *r); |
224 | 224 | ||
225 | extern void kdump_move_device_tree(void); | ||
226 | |||
225 | #endif /* __KERNEL__ */ | 227 | #endif /* __KERNEL__ */ |
226 | #endif /* _POWERPC_PROM_H */ | 228 | #endif /* _POWERPC_PROM_H */ |