From 728337d4c2e66d2f04da9742bf9159bd30989d07 Mon Sep 17 00:00:00 2001 From: merge Date: Wed, 28 Jan 2009 18:12:23 +0000 Subject: MERGE-andy-tracking-patchset-edits --- arch/arm/mach-s3c2440/Kconfig | 1 + arch/arm/plat-s3c/include/plat/regs-usb-hs-otg.h | 2 +- drivers/usb/gadget/s3c_hs_otg.c | 2 +- 3 files changed, 3 insertions(+), 2 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) diff --git a/drivers/usb/gadget/s3c_hs_otg.c b/drivers/usb/gadget/s3c_hs_otg.c index 91176dbe19b..25c62bd6303 100644 --- a/drivers/usb/gadget/s3c_hs_otg.c +++ b/drivers/usb/gadget/s3c_hs_otg.c @@ -38,7 +38,7 @@ static char *state_names[] = { "DATA_STATE_RECV" }; -#define S3C_USB_DBG_LEVEL 3 +#define S3C_USB_DBG_LEVEL 0 #define DBG(level, fmt, args...) do { \ if (level >= S3C_USB_DBG_LEVEL) { \ -- cgit v1.2.3