diff options
author | Ingo Molnar | 2008-07-22 09:06:21 +0200 |
---|---|---|
committer | Ingo Molnar | 2008-07-22 09:06:21 +0200 |
commit | 76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b (patch) | |
tree | 3824e008db9d554229a70c85fbbc13238276bd7a /arch/sparc64/kernel/pci_sun4v.c | |
parent | x86, lguest: fix apic_ops build on UP (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
download | kernel-qcow2-linux-76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b.tar.gz kernel-qcow2-linux-76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b.tar.xz kernel-qcow2-linux-76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b.zip |
Merge branch 'linus' into x86/x2apic
Diffstat (limited to 'arch/sparc64/kernel/pci_sun4v.c')
-rw-r--r-- | arch/sparc64/kernel/pci_sun4v.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c index e2bb9790039c..a104c80d319d 100644 --- a/arch/sparc64/kernel/pci_sun4v.c +++ b/arch/sparc64/kernel/pci_sun4v.c @@ -531,7 +531,7 @@ static void dma_4v_sync_sg_for_cpu(struct device *dev, /* Nothing to do... */ } -const struct dma_ops sun4v_dma_ops = { +static const struct dma_ops sun4v_dma_ops = { .alloc_coherent = dma_4v_alloc_coherent, .free_coherent = dma_4v_free_coherent, .map_single = dma_4v_map_single, |