From: Bernhard Urban <lewurm@gmx.net>
Date: Wed, 2 Sep 2009 22:46:29 +0000 (+0200)
Subject: Merge branch 'isr_test' of git://github.com/theStack/ppcskel into isr_test
X-Git-Tag: firstresponse~47
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=ppcskel.git;a=commitdiff_plain;h=0a6cd808a414dab189b1ffac82df6651dfb4ae34

Merge branch 'isr_test' of git://github.com/theStack/ppcskel into isr_test

Conflicts:
	ohci.c
---

0a6cd808a414dab189b1ffac82df6651dfb4ae34
diff --cc ohci.c
index 33d6034,04550f9..1bab91a
--- a/ohci.c
+++ b/ohci.c
@@@ -14,7 -14,8 +14,7 @@@ Copyright (C) 2009     Sebastian Falbes
  #include "irq.h"
  
  #define gecko_printf printf
- #define dma_addr(address) (u32)address
 -#define set32(address, flags) write32(address, read32(address) | flags)
+ #define dma_addr(address) virt_to_phys(address)
  
  
  static struct ohci_hcca hcca_oh0;