Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / include / mach / omap34xx.h

diff --git a/arch/arm/plat-omap/include/mach/omap34xx.h b/arch/arm/plat-omap/include/mach/omap34xx.h
index 8e0479fff05a286090a092ccd80601a2fa5ede8a..f54dc0b86cc3771b2bee5dca5026069bc49cf711 100644 (file)
--- a/arch/arm/plat-omap/include/mach/omap34xx.h
+++ b/arch/arm/plat-omap/include/mach/omap34xx.h
@@ -1,5 +1,5 @@
 /*
- * arch/arm/plat-omap/include/mach/omap34xx.h
+ * include/asm-arm/arch-omap/omap34xx.h
  *
  * This file contains the processor specific definitions of the TI OMAP34XX.
  *
@@ -53,6 +53,8 @@
 #define OMAP34XX_HSUSB_OTG_BASE        (L4_34XX_BASE + 0xAB000)
 #define OMAP34XX_HSUSB_HOST_BASE       (L4_34XX_BASE + 0x64000)
 #define OMAP34XX_USBTLL_BASE   (L4_34XX_BASE + 0x62000)
+#define OMAP34XX_SR1_BASE      0x480C9000
+#define OMAP34XX_SR2_BASE      0x480CB000
 
 
 #if defined(CONFIG_ARCH_OMAP3430)