From cc9f88242df412d3b3a91980a86e525950229a93 Mon Sep 17 00:00:00 2001

From: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com Date: Sun, 23 Sep 2007 03:23:30 +0200 Subject: [PATCH] drivers/usb : move usb drivers to drivers/usb

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- drivers/Makefile | 6 ++---- drivers/usb/Makefile | 3 ++- drivers/{ => usb}/isp116x-hcd.c | 0 drivers/{ => usb}/isp116x.h | 0 drivers/{ => usb}/sl811.h | 0 drivers/{ => usb}/sl811_usb.c | 2 +- drivers/{ => usb}/usb_ohci.c | 0 drivers/{ => usb}/usb_ohci.h | 0 drivers/{ => usb}/usbdcore.c | 0 drivers/{ => usb}/usbdcore_ep0.c | 0 drivers/{ => usb}/usbdcore_mpc8xx.c | 0 drivers/{ => usb}/usbdcore_omap1510.c | 0 12 files changed, 5 insertions(+), 6 deletions(-) rename drivers/{ => usb}/isp116x-hcd.c (100%) rename drivers/{ => usb}/isp116x.h (100%) rename drivers/{ => usb}/sl811.h (100%) rename drivers/{ => usb}/sl811_usb.c (99%) rename drivers/{ => usb}/usb_ohci.c (100%) rename drivers/{ => usb}/usb_ohci.h (100%) rename drivers/{ => usb}/usbdcore.c (100%) rename drivers/{ => usb}/usbdcore_ep0.c (100%) rename drivers/{ => usb}/usbdcore_mpc8xx.c (100%) rename drivers/{ => usb}/usbdcore_omap1510.c (100%)

diff --git a/drivers/Makefile b/drivers/Makefile index 97bf1c4..86722e9 100755 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -31,7 +31,7 @@ COBJS = 3c589.o 5701rls.o ali512x.o atmel_usart.o \ bcm570x.o bcm570x_autoneg.o cfb_console.o \ cs8900.o ct69000.o dc2114x.o dm9000x.o \ e1000.o eepro100.o enc28j60.o \ - inca-ip_sw.o isp116x-hcd.o \ + inca-ip_sw.o \ lan91c96.o macb.o \ natsemi.o ne2000.o netarm_eth.o netconsole.o \ ns16550.o ns8382x.o ns87308.o ns7520_eth.o \ @@ -41,11 +41,9 @@ COBJS = 3c589.o 5701rls.o ali512x.o atmel_usart.o \ sed13806.o sed156x.o \ serial.o serial_max3100.o \ serial_pl010.o serial_pl011.o serial_xuartlite.o \ - sl811_usb.o sm501.o smc91111.o smiLynxEM.o \ + sm501.o smc91111.o smiLynxEM.o \ ti_pci1410a.o tigon3.o tsec.o \ tsi108_eth.o \ - usb_ohci.o \ - usbdcore.o usbdcore_ep0.o usbdcore_mpc8xx.o usbdcore_omap1510.o \ usbtty.o \ videomodes.o \ ks8695eth.o \ diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index 4468d78..8757547 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile @@ -25,7 +25,8 @@ include $(TOPDIR)/config.mk

LIB := $(obj)libusb.a

-COBJS := +COBJS := isp116x-hcd.o sl811_usb.o usb_ohci.o usbdcore.o usbdcore_ep0.o \ + usbdcore_mpc8xx.o usbdcore_omap1510.o

SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/drivers/isp116x-hcd.c b/drivers/usb/isp116x-hcd.c similarity index 100% rename from drivers/isp116x-hcd.c rename to drivers/usb/isp116x-hcd.c diff --git a/drivers/isp116x.h b/drivers/usb/isp116x.h similarity index 100% rename from drivers/isp116x.h rename to drivers/usb/isp116x.h diff --git a/drivers/sl811.h b/drivers/usb/sl811.h similarity index 100% rename from drivers/sl811.h rename to drivers/usb/sl811.h diff --git a/drivers/sl811_usb.c b/drivers/usb/sl811_usb.c similarity index 99% rename from drivers/sl811_usb.c rename to drivers/usb/sl811_usb.c index b0cdf0b..c1f8427 100644 --- a/drivers/sl811_usb.c +++ b/drivers/usb/sl811_usb.c @@ -41,7 +41,7 @@ #include <usb.h> #include "sl811.h"

-#include "../board/kup/common/kup.h" +#include "../../board/kup/common/kup.h"

#ifdef __PPC__ # define EIEIO __asm__ volatile ("eieio") diff --git a/drivers/usb_ohci.c b/drivers/usb/usb_ohci.c similarity index 100% rename from drivers/usb_ohci.c rename to drivers/usb/usb_ohci.c diff --git a/drivers/usb_ohci.h b/drivers/usb/usb_ohci.h similarity index 100% rename from drivers/usb_ohci.h rename to drivers/usb/usb_ohci.h diff --git a/drivers/usbdcore.c b/drivers/usb/usbdcore.c similarity index 100% rename from drivers/usbdcore.c rename to drivers/usb/usbdcore.c diff --git a/drivers/usbdcore_ep0.c b/drivers/usb/usbdcore_ep0.c similarity index 100% rename from drivers/usbdcore_ep0.c rename to drivers/usb/usbdcore_ep0.c diff --git a/drivers/usbdcore_mpc8xx.c b/drivers/usb/usbdcore_mpc8xx.c similarity index 100% rename from drivers/usbdcore_mpc8xx.c rename to drivers/usb/usbdcore_mpc8xx.c diff --git a/drivers/usbdcore_omap1510.c b/drivers/usb/usbdcore_omap1510.c similarity index 100% rename from drivers/usbdcore_omap1510.c rename to drivers/usb/usbdcore_omap1510.c