diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-13 10:32:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-13 10:32:53 -0700 |
| commit | acb11bcdbde29cfedaaedfea314b922b99274907 (patch) | |
| tree | 1c644b34608d0f36c09e97f30ad77472fe70a096 /arch/arm/plat-s5p/include/plat/map-s5p.h | |
| parent | 33a538833f1dc46965d11cff1efa756702a9b138 (diff) | |
| parent | 2aec0d697725bc4d402d7a9b51587af53a4cca76 (diff) | |
Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung
* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C2410: remove the now empty mach-s3c2410/irq.c
ARM: S3C24XX: Move s3c24xx_irq_syscore_ops to plat-s3c24xx/irq.c
ARM: S3C24xx: Fix missing struct for s3c2410_dma_chan
ARM: SAMSUNG: Remove unused onenand plat functions
ARM: EXYNOS4: Remove compiler warning on exynos4_pwm4_resume
ARM: S5P: Fix compilation error for exynos4_defconfig
ARM: S5P: Should be S3C_VA_USB_HSPHY instead of S5P_VA_XX
ARM: S5P64X0: Fix SPI platform device name
ARM: S5PV210: Fix possible null pointer dereference
Diffstat (limited to 'arch/arm/plat-s5p/include/plat/map-s5p.h')
| -rw-r--r-- | arch/arm/plat-s5p/include/plat/map-s5p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s5p/include/plat/map-s5p.h b/arch/arm/plat-s5p/include/plat/map-s5p.h index a6c3d327ce72..d973d39666a3 100644 --- a/arch/arm/plat-s5p/include/plat/map-s5p.h +++ b/arch/arm/plat-s5p/include/plat/map-s5p.h @@ -39,7 +39,7 @@ #define S5P_VA_TWD S5P_VA_COREPERI(0x600) #define S5P_VA_GIC_DIST S5P_VA_COREPERI(0x1000) -#define S5P_VA_USB_HSPHY S3C_ADDR(0x02900000) +#define S3C_VA_USB_HSPHY S3C_ADDR(0x02900000) #define VA_VIC(x) (S3C_VA_IRQ + ((x) * 0x10000)) #define VA_VIC0 VA_VIC(0) |