--- include/sound/pcm.h.orig	2004-03-16 23:24:29.564616688 +0100
+++ include/sound/pcm.h	2004-03-16 23:20:02.236256776 +0100
@@ -904,6 +904,8 @@
  *  Memory
  */
 
+#define snd_pcm_dma_flags(x) ((void *)(unsigned long)(x))
+
 int snd_pcm_lib_preallocate_free(snd_pcm_substream_t *substream);
 int snd_pcm_lib_preallocate_free_for_all(snd_pcm_t *pcm);
 int snd_pcm_lib_preallocate_pages(snd_pcm_substream_t *substream,
--- arch/ppc/syslib/indirect_pci.c.orig	2004-03-16 23:25:49.905403032 +0100
+++ arch/ppc/syslib/indirect_pci.c	2004-03-16 13:23:20.000000000 +0100
@@ -44,8 +44,8 @@
 			cfg_type = 1;
 
 	PCI_CFG_OUT(hose->cfg_addr, 					 
-		 (0x80000000 | ((dev->bus->number - hose->bus_offset) << 16) 
-		  | (dev->devfn << 8) | ((offset & 0xfc) | cfg_type)));	
+		 (0x80000000 | ((bus->number - hose->bus_offset) << 16) 
+		  | (devfn << 8) | ((offset & 0xfc) | cfg_type)));	
 
 	/*
 	 * Note: the caller has already checked that offset is
@@ -83,8 +83,8 @@
 			cfg_type = 1;
 
 	PCI_CFG_OUT(hose->cfg_addr, 					 
-		 (0x80000000 | ((dev->bus->number - hose->bus_offset) << 16) 
-		  | (dev->devfn << 8) | ((offset & 0xfc) | cfg_type)));	
+		 (0x80000000 | ((bus->number - hose->bus_offset) << 16) 
+		  | (devfn << 8) | ((offset & 0xfc) | cfg_type)));	
 
 	/*
 	 * Note: the caller has already checked that offset is
--- include/asm-ppc/pci.h.orig	2004-03-16 23:27:41.291469776 +0100
+++ include/asm-ppc/pci.h	2004-03-16 23:27:28.587401088 +0100
@@ -10,6 +10,11 @@
 #include <asm/io.h>
 #include <asm/pci-bridge.h>
 
+#define consistent_sync_for_cpu consistent_sync
+#define consistent_sync_for_device consistent_sync
+#define consistent_sync_page_for_cpu consistent_sync_page
+#define consistent_sync_page_for_device consistent_sync_page
+
 struct pci_dev;
 
 /* Values for the `which' argument to sys_pciconfig_iobase syscall.  */