git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
drivers
/
usb
/
host
/
ohci-da8xx.c
diff --git
a/drivers/usb/host/ohci-da8xx.c
b/drivers/usb/host/ohci-da8xx.c
index
4aa08d3
..
d22fb4d
100644
(file)
--- a/
drivers/usb/host/ohci-da8xx.c
+++ b/
drivers/usb/host/ohci-da8xx.c
@@
-23,7
+23,7
@@
#error "This file is DA8xx bus glue. Define CONFIG_ARCH_DAVINCI_DA8XX."
#endif
#error "This file is DA8xx bus glue. Define CONFIG_ARCH_DAVINCI_DA8XX."
#endif
-#define CFGCHIP2 DA8XX_SYSCFG_VIRT(DA8XX_CFGCHIP2_REG)
+#define CFGCHIP2 DA8XX_SYSCFG
0
_VIRT(DA8XX_CFGCHIP2_REG)
static struct clk *usb11_clk;
static struct clk *usb20_clk;
static struct clk *usb11_clk;
static struct clk *usb20_clk;