[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Andy Green]

The following commit has been merged in the andy-tracking branch:
commit dcf9d0d617f5ceedc4259f50b791601b0f613adc
Author: Andy Green <andy at openmoko.com>
Date:   Mon Mar 9 21:01:27 2009 +0000

    fix-s3c-ohci-move-usb-control.h
    
    Signed-off-by: Andy Green <andy at openmoko.com>

diff --git a/arch/arm/mach-s3c6410/Kconfig b/arch/arm/mach-s3c6410/Kconfig
index 34d9b65..9fd6fb3 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 6de8dd5..3b6199e 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 2ca998e..8bba2f0 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
similarity index 87%
rename from arch/arm/mach-s3c2410/include/mach/usb-control.h
rename to arch/arm/plat-s3c/include/plat/usb-control.h
index cd91d15..443e84a 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 at 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)
 

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko