diff options
| author | merge <null@invalid> | 2009-01-28 18:12:23 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-01-28 18:12:23 +0000 |
| commit | 728337d4c2e66d2f04da9742bf9159bd30989d07 (patch) | |
| tree | a4721661df0bfbe98b53b7201e8e53789e2effa3 /arch/arm | |
| parent | 27692fc9f6238c81146a0fb3e1a5c27d87825819 (diff) | |
MERGE-andy-tracking-patchset-edits
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-s3c2440/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/plat-s3c/include/plat/regs-usb-hs-otg.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index f5b42e4ed81..584f60545b5 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig @@ -94,6 +94,7 @@ config MACH_NEO1973_GTA02 select GTA02_HDQ select MACH_NEO1973 select S3C2410_PWM + select S3C2410_CLOCK help Say Y here if you are using the FIC Neo1973 GSM Phone diff --git a/arch/arm/plat-s3c/include/plat/regs-usb-hs-otg.h b/arch/arm/plat-s3c/include/plat/regs-usb-hs-otg.h index d3e7e689a64..416c5d747a8 100644 --- a/arch/arm/plat-s3c/include/plat/regs-usb-hs-otg.h +++ b/arch/arm/plat-s3c/include/plat/regs-usb-hs-otg.h @@ -13,7 +13,7 @@ #define __ASM_ARCH_REGS_USB_HS_OTG_H /* USB2.0 OTG Controller register */ -#define S3C_USBOTG_PHYREG(x) ((x) + S3C64XX_VA_OTGSFR) +#define S3C_USBOTG_PHYREG(x) ((x) /*+ S3C64XX_VA_OTGSFR */) #define S3C_USBOTG_PHYPWR S3C_USBOTG_PHYREG(0x0) #define S3C_USBOTG_PHYCLK S3C_USBOTG_PHYREG(0x4) #define S3C_USBOTG_RSTCON S3C_USBOTG_PHYREG(0x8) |