diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 18:35:30 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 18:35:30 -0500 |
| commit | ec2f9d1331f658433411c58077871e1eef4ee1b4 (patch) | |
| tree | 6d0e5f6665e5c89ee392379967a52e6fcae17cf2 /arch/sparc | |
| parent | 89697f1d715e20fff0361cca79efd5a371623af7 (diff) | |
| parent | 34cc560e6a72ff414ff7d107426a411b0a093ad3 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Re-export saved_command_line to modules.
[SPARC64]: Increase command line size to 2048 like other arches.
[SPARC64]: We do not need ZONE_DMA.
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/sparc_ksyms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c index bba1b0e02f94..d8e008a04e2b 100644 --- a/arch/sparc/kernel/sparc_ksyms.c +++ b/arch/sparc/kernel/sparc_ksyms.c | |||
| @@ -229,7 +229,7 @@ EXPORT_SYMBOL(prom_getproplen); | |||
| 229 | EXPORT_SYMBOL(prom_getproperty); | 229 | EXPORT_SYMBOL(prom_getproperty); |
| 230 | EXPORT_SYMBOL(prom_node_has_property); | 230 | EXPORT_SYMBOL(prom_node_has_property); |
| 231 | EXPORT_SYMBOL(prom_setprop); | 231 | EXPORT_SYMBOL(prom_setprop); |
| 232 | EXPORT_SYMBOL(boot_command_line); | 232 | EXPORT_SYMBOL(saved_command_line); |
| 233 | EXPORT_SYMBOL(prom_apply_obio_ranges); | 233 | EXPORT_SYMBOL(prom_apply_obio_ranges); |
| 234 | EXPORT_SYMBOL(prom_feval); | 234 | EXPORT_SYMBOL(prom_feval); |
| 235 | EXPORT_SYMBOL(prom_getbool); | 235 | EXPORT_SYMBOL(prom_getbool); |