git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-kirkwood
/
include
/
mach
/
kirkwood.h
diff --git
a/arch/arm/mach-kirkwood/include/mach/kirkwood.h
b/arch/arm/mach-kirkwood/include/mach/kirkwood.h
index d141af4c274422a542634b33581f9488385def59..93fc2ec95e7687b30b6144f2116adb0664266a4d 100644
(file)
--- a/
arch/arm/mach-kirkwood/include/mach/kirkwood.h
+++ b/
arch/arm/mach-kirkwood/include/mach/kirkwood.h
@@
-111,6
+111,9
@@
#define SDIO_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x90000)
+#define AUDIO_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0xA0000)
+#define AUDIO_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0xA0000)
+
/*
* Supported devices and revisions.
*/