Merge branch 'master' into tk71

[mv-sheeva.git] / arch / arm / mach-cns3xxx / include / mach / cns3xxx.h

diff --git a/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h b/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h
index 6dbce13771ca49c83c89dde5b4f0b6f734e20c1f..191c8e57f2890f09c30610bce584194bc1c3d7f1 100644 (file)
--- a/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h
+++ b/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h
@@ -165,7 +165,6 @@
 #define CNS3XXX_USBOTG_BASE_VIRT               0xFFF15000
 
 #define CNS3XXX_USB_BASE                       0x82000000      /* USB Host Control */
-#define CNS3XXX_USB_BASE_VIRT                  0xFFF16000
 
 #define CNS3XXX_SATA2_BASE                     0x83000000      /* SATA */
 #define CNS3XXX_SATA2_SIZE                     SZ_16M
@@ -184,7 +183,6 @@
 #define CNS3XXX_2DG_BASE_VIRT                  0xFFF1B000
 
 #define CNS3XXX_USB_OHCI_BASE                  0x88000000      /* USB OHCI */
-#define CNS3XXX_USB_OHCI_BASE_VIRT             0xFFF1C000
 
 #define CNS3XXX_L2C_BASE                       0x92000000      /* L2 Cache Control */
 #define CNS3XXX_L2C_BASE_VIRT                  0xFFF27000