diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:04:15 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:06:24 -0500 |
| commit | a7790532f5b7358c33a6b1834dc2b318de209f31 (patch) | |
| tree | 0ceb9e24b3f54cb5c8453fb5a218e2a94a0f1cce /arch/sparc/kernel/sparc_ksyms_64.c | |
| parent | 2764fb4244cc1bc08df3667924ca4a972e90ac70 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
The SmartMedia FTL code depends on new kfifo bits from 2.6.33
Diffstat (limited to 'arch/sparc/kernel/sparc_ksyms_64.c')
| -rw-r--r-- | arch/sparc/kernel/sparc_ksyms_64.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/sparc/kernel/sparc_ksyms_64.c b/arch/sparc/kernel/sparc_ksyms_64.c index 0f26066a08d9..372ad59c4cba 100644 --- a/arch/sparc/kernel/sparc_ksyms_64.c +++ b/arch/sparc/kernel/sparc_ksyms_64.c | |||
| @@ -38,17 +38,5 @@ EXPORT_SYMBOL(sun4v_niagara_setperf); | |||
| 38 | EXPORT_SYMBOL(sun4v_niagara2_getperf); | 38 | EXPORT_SYMBOL(sun4v_niagara2_getperf); |
| 39 | EXPORT_SYMBOL(sun4v_niagara2_setperf); | 39 | EXPORT_SYMBOL(sun4v_niagara2_setperf); |
| 40 | 40 | ||
| 41 | #ifdef CONFIG_PCI | ||
| 42 | /* inline functions in asm/pci_64.h */ | ||
| 43 | EXPORT_SYMBOL(pci_alloc_consistent); | ||
| 44 | EXPORT_SYMBOL(pci_free_consistent); | ||
| 45 | EXPORT_SYMBOL(pci_map_single); | ||
| 46 | EXPORT_SYMBOL(pci_unmap_single); | ||
| 47 | EXPORT_SYMBOL(pci_map_sg); | ||
| 48 | EXPORT_SYMBOL(pci_unmap_sg); | ||
| 49 | EXPORT_SYMBOL(pci_dma_sync_single_for_cpu); | ||
| 50 | EXPORT_SYMBOL(pci_dma_sync_sg_for_cpu); | ||
| 51 | #endif | ||
| 52 | |||
| 53 | /* Exporting a symbol from /init/main.c */ | 41 | /* Exporting a symbol from /init/main.c */ |
| 54 | EXPORT_SYMBOL(saved_command_line); | 42 | EXPORT_SYMBOL(saved_command_line); |