diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-10-06 11:36:55 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-10-06 11:36:55 -0400 |
| commit | d94e5fcbf1420366dcb4102bafe04dbcfc0d0d4b (patch) | |
| tree | a9b7de7df6da5c3132cc68169b9c47ba288ccd42 /arch/sparc/include/asm/prom.h | |
| parent | d55651168a20078a94597a297d5cdfd807bf07b6 (diff) | |
| parent | 374576a8b6f865022c0fd1ca62396889b23d66dd (diff) | |
Merge commit 'v2.6.32-rc3'
Diffstat (limited to 'arch/sparc/include/asm/prom.h')
| -rw-r--r-- | arch/sparc/include/asm/prom.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/prom.h b/arch/sparc/include/asm/prom.h index be8d7aaeb60d..82a190d7efc1 100644 --- a/arch/sparc/include/asm/prom.h +++ b/arch/sparc/include/asm/prom.h | |||
| @@ -118,5 +118,8 @@ extern struct device_node *of_console_device; | |||
| 118 | extern char *of_console_path; | 118 | extern char *of_console_path; |
| 119 | extern char *of_console_options; | 119 | extern char *of_console_options; |
| 120 | 120 | ||
| 121 | extern void (*prom_build_more)(struct device_node *dp, struct device_node ***nextp); | ||
| 122 | extern char *build_full_name(struct device_node *dp); | ||
| 123 | |||
| 121 | #endif /* __KERNEL__ */ | 124 | #endif /* __KERNEL__ */ |
| 122 | #endif /* _SPARC_PROM_H */ | 125 | #endif /* _SPARC_PROM_H */ |