diff options
| author | Andy Green <andy@openmoko.com> | 2009-03-09 21:01:27 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-03-09 21:01:27 +0000 |
| commit | dcf9d0d617f5ceedc4259f50b791601b0f613adc (patch) | |
| tree | d0ff5f0cd49afc5f5d2e08b3989126cc804f0d5d /arch | |
| parent | 0f6f58ca20028825df5e57f09670313f23ce5a9a (diff) | |
fix-s3c-ohci-move-usb-control.h
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s3c6410/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s3c/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/plat-s3c/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/plat-s3c/include/plat/usb-control.h (renamed from arch/arm/mach-s3c2410/include/mach/usb-control.h) | 4 |
4 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/mach-s3c6410/Kconfig b/arch/arm/mach-s3c6410/Kconfig index 34d9b65597a..9fd6fb3cfb8 100644 --- a/arch/arm/mach-s3c6410/Kconfig +++ b/arch/arm/mach-s3c6410/Kconfig @@ -67,7 +67,7 @@ config MACH_OM_3D7K select S3C_DEV_HSMMC select S3C_DEV_HSMMC1 select S3C_DEV_I2C1 - select S3C_DEV_USBHOST + select S3C_DEV_USB_HOST select S3C6410_SETUP_SDHCI select S3C64XX_SETUP_I2C1 select S3C_DEV_FB diff --git a/arch/arm/plat-s3c/Kconfig b/arch/arm/plat-s3c/Kconfig index 6de8dd59ad3..3b6199edcae 100644 --- a/arch/arm/plat-s3c/Kconfig +++ b/arch/arm/plat-s3c/Kconfig @@ -197,9 +197,5 @@ config S3C_DEV_CAMIF bool help Compile in platform device definitions for camera interface code -config S3C_DEV_USBHOST - bool - help - Compile in platform device definition for USB OHCI 1.0 host endif diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile index 2ca998e8c20..8bba2f03880 100644 --- a/arch/arm/plat-s3c/Makefile +++ b/arch/arm/plat-s3c/Makefile @@ -36,7 +36,6 @@ obj-y += dev-i2c0.o obj-$(CONFIG_S3C_DEV_I2C1) += dev-i2c1.o obj-$(CONFIG_S3C_DEV_FB) += dev-fb.o obj-$(CONFIG_S3C_DEV_CAMIF) += dev-camif.o -obj-$(CONFIG_S3C_DEV_USBHOST) += dev-usbhost.o obj-$(CONFIG_S3C_PWM) += pwm.o obj-$(CONFIG_S3C_DMA) += dma.o diff --git a/arch/arm/mach-s3c2410/include/mach/usb-control.h b/arch/arm/plat-s3c/include/plat/usb-control.h index cd91d1591f3..443e84ab35c 100644 --- a/arch/arm/mach-s3c2410/include/mach/usb-control.h +++ b/arch/arm/plat-s3c/include/plat/usb-control.h @@ -1,4 +1,4 @@ -/* arch/arm/mach-s3c2410/include/mach/usb-control.h +/* arch/arm/plat-s3c/include/plat/usb-control.h * * Copyright (c) 2004 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> @@ -11,7 +11,7 @@ */ #ifndef __ASM_ARCH_USBCONTROL_H -#define __ASM_ARCH_USBCONTROL_H "arch/arm/mach-s3c2410/include/mach/usb-control.h" +#define __ASM_ARCH_USBCONTROL_H "arch/arm/plat-s3c/include/plat/usb-control.h" #define S3C_HCDFLG_USED (1) |