[parisc-linux-cvs] linux deller

[Helge Deller]

--------------Boundary-00=_PSXW8Q7EC4NL39XQUHUS
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 8bit

On Saturday 02 February 2002 17:02, Helge Deller wrote:
> CVSROOT:	/var/cvs
> Module name:	linux
> Changes by:	deller	02/02/02 09:02:56
>
> Modified files:
> 	arch/parisc/kernel: Makefile parisc_ksyms.c
>
> Log message:
> - fix dependency on PCI settings on PA11 machines (GSC bus is handled
> internally as a PCI bus), 
> - could someone please fix the PA20 build (declaration of hppa_dma_ops)


--------------Boundary-00=_PSXW8Q7EC4NL39XQUHUS
Content-Type: text/plain;
  charset="iso-8859-1";
  name="diff"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="diff"

Index: Makefile
===================================================================
RCS file: /var/cvs/linux/arch/parisc/kernel/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- Makefile	2001/11/29 19:57:04	1.40
+++ Makefile	2002/02/02 16:00:17
@@ -21,15 +21,16 @@ obj-n		:=
 obj-		:=
 
 obj-y           += cache.o pacache.o setup.o traps.o time.o irq.o \
-		pa7300lc.o pci-dma.o syscall.o entry.o sys_parisc.o \
-		firmware.o ptrace.o hardware.o inventory.o drivers.o \
-		semaphore.o signal.o hpmc.o real2.o parisc_ksyms.o \
-		unaligned.o processor.o power.o
+		pa7300lc.o syscall.o entry.o sys_parisc.o firmware.o \
+		ptrace.o hardware.o inventory.o drivers.o semaphore.o \
+		signal.o hpmc.o real2.o parisc_ksyms.o unaligned.o \
+		processor.o power.o
 
 export-objs	:= parisc_ksyms.o superio.o
 
 
 obj-$(CONFIG_SMP) += smp.o irq_smp.o
+obj-$(CONFIG_PA11) += pci-dma.o
 obj-$(CONFIG_PCI) += pci.o
 obj-$(CONFIG_VT) += keyboard.o
 obj-$(CONFIG_PCI_LBA) += lba_pci.o
Index: parisc_ksyms.c
===================================================================
RCS file: /var/cvs/linux/arch/parisc/kernel/parisc_ksyms.c,v
retrieving revision 1.39
diff -u -p -r1.39 parisc_ksyms.c
--- parisc_ksyms.c	2002/01/30 08:14:47	1.39
+++ parisc_ksyms.c	2002/02/02 16:00:17
@@ -25,10 +25,10 @@ EXPORT_SYMBOL(strncpy);
 EXPORT_SYMBOL(strtok);
 EXPORT_SYMBOL(strstr);
 
-#if defined(CONFIG_PCI) || defined(CONFIG_ISA)
 #include <asm/hardware.h>	/* struct parisc_device for asm/pci.h */
 #include <linux/pci.h>
 EXPORT_SYMBOL(hppa_dma_ops);
+#if defined(CONFIG_PCI) || defined(CONFIG_ISA)
 EXPORT_SYMBOL(get_pci_node_path);
 #endif
 

--------------Boundary-00=_PSXW8Q7EC4NL39XQUHUS--