--- 269_clean/arch/cris/arch-v10/drivers/Makefile	Thu Jan 22 09:24:12 2004
+++ 269_modified/arch/cris/arch-v10/drivers/Makefile	Tue Nov  2 12:33:30 2004
@@ -2,15 +2,11 @@
 # Makefile for Etrax-specific drivers
 #
 
-obj-$(CONFIG_ETRAX_ETHERNET)            += ethernet.o
-obj-$(CONFIG_ETRAX_SERIAL)              += serial.o
 obj-$(CONFIG_ETRAX_AXISFLASHMAP)        += axisflashmap.o
 obj-$(CONFIG_ETRAX_I2C) 	        += i2c.o
 obj-$(CONFIG_ETRAX_I2C_EEPROM)          += eeprom.o
 obj-$(CONFIG_ETRAX_GPIO) 	        += gpio.o
 obj-$(CONFIG_ETRAX_DS1302)              += ds1302.o
 obj-$(CONFIG_ETRAX_PCF8563)		+= pcf8563.o
-obj-$(CONFIG_ETRAX_IDE)                 += ide.o
-obj-$(CONFIG_ETRAX_USB_HOST)            += usb-host.o
 
 
--- 269_clean/drivers/net/Makefile	Tue Oct 19 15:09:44 2004
+++ 269_modified/drivers/net/Makefile	Tue Nov  2 12:34:49 2004
@@ -194,5 +194,6 @@
 obj-$(CONFIG_NET_TULIP) += tulip/
 obj-$(CONFIG_HAMRADIO) += hamradio/
 obj-$(CONFIG_IRDA) += irda/
+obj-$(CONFIG_ETRAX_ETHERNET) += cris/
 
 obj-$(CONFIG_NETCONSOLE) += netconsole.o
--- 269_clean/drivers/net/cris/Makefile	Thu Jan  1 01:00:00 1970
+++ 269_modified/drivers/net/cris/Makefile	Tue Nov  2 13:07:12 2004
@@ -0,0 +1 @@
+obj-$(CONFIG_ETRAX_ARCH_V10)		+= v10/
--- 269_clean/drivers/net/cris/v10/Makefile	Thu Jan  1 01:00:00 1970
+++ 269_modified/drivers/net/cris/v10/Makefile	Tue Nov  2 12:35:35 2004
@@ -0,0 +1 @@
+obj-y		:= ethernet.o
--- 269_clean/drivers/ide/Makefile	Mon Aug 16 14:38:33 2004
+++ 269_modified/drivers/ide/Makefile	Tue Nov  2 12:28:53 2004
@@ -52,3 +52,4 @@
 
 obj-$(CONFIG_BLK_DEV_IDE)		+= legacy/ arm/
 obj-$(CONFIG_BLK_DEV_HD)		+= legacy/
+obj-$(CONFIG_ETRAX_IDE)			+= cris/
\ No newline at end of file
--- 269_clean/drivers/ide/cris/Makefile	Thu Jan  1 01:00:00 1970
+++ 269_modified/drivers/ide/cris/Makefile	Tue Nov  2 13:06:57 2004
@@ -0,0 +1,3 @@
+obj-$(CONFIG_ETRAX_ARCH_V10)		+= v10/
+
+EXTRA_CFLAGS	:= -Idrivers/ide
--- 269_clean/drivers/ide/cris/v10/Makefile	Thu Jan  1 01:00:00 1970
+++ 269_modified/drivers/ide/cris/v10/Makefile	Tue Nov  2 12:33:19 2004
@@ -0,0 +1,3 @@
+obj-y		:= ide.o
+
+EXTRA_CFLAGS	:= -Idrivers/ide
--- 269_clean/drivers/serial/Makefile	Mon Aug 16 10:14:33 2004
+++ 269_modified/drivers/serial/Makefile	Tue Nov  2 12:36:08 2004
@@ -41,3 +41,4 @@
 obj-$(CONFIG_SERIAL_SGI_L1_CONSOLE) += sn_console.o
 obj-$(CONFIG_SERIAL_CPM) += cpm_uart/
 obj-$(CONFIG_SERIAL_MPC52xx) += mpc52xx_uart.o
+obj-$(CONFIG_ETRAX_SERIAL) += cris/
--- 269_clean/drivers/serial/cris/Makefile	Thu Jan  1 01:00:00 1970
+++ 269_modified/drivers/serial/cris/Makefile	Tue Nov  2 13:07:26 2004
@@ -0,0 +1 @@
+obj-$(CONFIG_ETRAX_ARCH_V10)		:= v10/
--- 269_clean/drivers/serial/cris/v10/Makefile	Thu Jan  1 01:00:00 1970
+++ 269_modified/drivers/serial/cris/v10/Makefile	Tue Nov  2 12:37:12 2004
@@ -0,0 +1 @@
+obj-y		:= serial.o
--- 269_clean/drivers/usb/Makefile	Mon Jun 21 12:31:30 2004
+++ 269_modified/drivers/usb/Makefile	Tue Nov  2 12:38:11 2004
@@ -67,3 +67,5 @@
 obj-$(CONFIG_USB_TIGL)		+= misc/
 obj-$(CONFIG_USB_USS720)	+= misc/
 obj-$(CONFIG_USB_PHIDGETSERVO)	+= misc/
+
+obj-$(CONFIG_ETRAX_USB_HOST)	+= host/cris/
\ No newline at end of file
--- 269_clean/drivers/usb/host/cris/Makefile	Thu Jan  1 01:00:00 1970
+++ 269_modified/drivers/usb/host/cris/Makefile	Tue Nov  2 13:07:37 2004
@@ -0,0 +1 @@
+obj-$(CONFIG_ETRAX_ARCH_V10)		+= v10/
--- 269_clean/drivers/usb/host/cris/v10/Makefile	Thu Jan  1 01:00:00 1970
+++ 269_modified/drivers/usb/host/cris/v10/Makefile	Tue Nov  2 12:38:56 2004
@@ -0,0 +1 @@
+obj-y		:= usb-host.o
\ No newline at end of file