From c46667ddb9b748165615d55a8c3db9889eeb49ef Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Tue, 1 Mar 2011 20:08:15 +0530 Subject: [PATCH] --- yaml --- r: 235381 b: refs/heads/master c: a8480ea0bedbf049423a4caa9b09d371614c07dc h: refs/heads/master i: 235379: e1256d91ac37ac04f535ee1cf2dd24833b735860 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/Makefile | 2 +- trunk/arch/arm/mach-omap2/{usb-ehci.c => usb-host.c} | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) rename trunk/arch/arm/mach-omap2/{usb-ehci.c => usb-host.c} (98%) diff --git a/[refs] b/[refs] index 604f238620fc..671ad6ca49b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09f0607d8be62469a9b33034c8d3def9a5c7cbb7 +refs/heads/master: a8480ea0bedbf049423a4caa9b09d371614c07dc diff --git a/trunk/arch/arm/mach-omap2/Makefile b/trunk/arch/arm/mach-omap2/Makefile index 1c0c2b02d870..64dc4176407b 100644 --- a/trunk/arch/arm/mach-omap2/Makefile +++ b/trunk/arch/arm/mach-omap2/Makefile @@ -229,7 +229,7 @@ usbfs-$(CONFIG_ARCH_OMAP_OTG) := usb-fs.o obj-y += $(usbfs-m) $(usbfs-y) obj-y += usb-musb.o obj-$(CONFIG_MACH_OMAP2_TUSB6010) += usb-tusb6010.o -obj-y += usb-ehci.o +obj-y += usb-host.o onenand-$(CONFIG_MTD_ONENAND_OMAP2) := gpmc-onenand.o obj-y += $(onenand-m) $(onenand-y) diff --git a/trunk/arch/arm/mach-omap2/usb-ehci.c b/trunk/arch/arm/mach-omap2/usb-host.c similarity index 98% rename from trunk/arch/arm/mach-omap2/usb-ehci.c rename to trunk/arch/arm/mach-omap2/usb-host.c index 2c74fa171181..45f9b80b6d20 100644 --- a/trunk/arch/arm/mach-omap2/usb-ehci.c +++ b/trunk/arch/arm/mach-omap2/usb-host.c @@ -1,14 +1,14 @@ /* - * linux/arch/arm/mach-omap2/usb-ehci.c + * usb-host.c - OMAP USB Host * * This file will contain the board specific details for the - * Synopsys EHCI host controller on OMAP3430 + * Synopsys EHCI/OHCI host controller on OMAP3430 and onwards * - * Copyright (C) 2007 Texas Instruments + * Copyright (C) 2007-2011 Texas Instruments * Author: Vikram Pandita * * Generalization by: - * Felipe Balbi + * Felipe Balbi * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as