Merge branch 'isr_test' of git://github.com/theStack/ppcskel into isr_test
authorBernhard Urban <lewurm@gmx.net>
Wed, 2 Sep 2009 22:46:29 +0000 (00:46 +0200)
committerBernhard Urban <lewurm@gmx.net>
Wed, 2 Sep 2009 22:46:29 +0000 (00:46 +0200)
Conflicts:
ohci.c

1  2 
exception.c
ohci.c

diff --cc exception.c
Simple merge
diff --cc ohci.c
index 33d6034ae80d451b6fc5faf2e55f68727007b1b5,04550f903bfeec385746e216e2b8678476fb3357..1bab91a5b7bac17c06fdfedd6629b875a0f9531f
--- 1/ohci.c
--- 2/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;