diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-03 10:31:38 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-03 10:31:38 +0000 |
| commit | 50401d77ee4904673042dd737eed436067cc23f5 (patch) | |
| tree | c92e6a9cc0f9a81fb5f9a9f8a69b0c7d7397b400 /arch/arm/mach-cns3xxx/include/mach/cns3xxx.h | |
| parent | 206323c181371f3d5fab36c6d33e1fac09b61082 (diff) | |
| parent | 760efe6910d5743084b586d3d0a3b65aea96fb2f (diff) | |
Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx into devel-stable
Diffstat (limited to 'arch/arm/mach-cns3xxx/include/mach/cns3xxx.h')
| -rw-r--r-- | arch/arm/mach-cns3xxx/include/mach/cns3xxx.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h b/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h index 6dbce13771ca..191c8e57f289 100644 --- 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 |