diff -urN drivers/usb/Config.in.old drivers/usb/Config.in
--- drivers/usb/Config.in.old	Mon Sep  2 10:12:18 2002
+++ drivers/usb/Config.in	Tue Sep  3 11:32:06 2002
@@ -18,7 +18,7 @@
    bool '  Long timeout for slow-responding devices (some MGE Ellipse UPSes)' CONFIG_USB_LONG_TIMEOUT
 
    comment 'USB Host Controller Drivers'
-   source drivers/usb/hcd/Config.in
+   # source drivers/usb/hcd/Config.in
    if [ "$CONFIG_USB_UHCI_ALT" != "y" ]; then
       dep_tristate '  UHCI (Intel PIIX4, VIA, ...) support' CONFIG_USB_UHCI $CONFIG_USB
    fi
diff -urN drivers/char/Config.in.old drivers/char/Config.in
--- drivers/char/Config.in.old	Mon Sep  2 10:08:33 2002
+++ drivers/char/Config.in	Tue Sep  3 11:32:06 2002
@@ -389,7 +389,7 @@
    bool '  Build drivers for old (XFree 4.0) DRM' CONFIG_DRM_OLD
    if [ "$CONFIG_DRM_OLD" = "y" ]; then
       comment 'DRM 4.0 drivers'
-      source drivers/char/drm-4.0/Config.in
+      source drivers/char/drm/Config.in
    else
       comment 'DRM 4.1 drivers'
       define_bool CONFIG_DRM_NEW y
diff -urN drivers/char/Makefile.old drivers/char/Makefile
--- drivers/char/Makefile.old	Mon Sep  2 10:08:33 2002
+++ drivers/char/Makefile	Tue Sep  3 11:36:17 2002
@@ -27,7 +27,7 @@
 			sonypi.o tty_io.o tty_ioctl.o generic_serial.o \
 			au1000_gpio.o
 
-mod-subdirs	:=	joystick ftape drm drm-4.0 pcmcia
+mod-subdirs	:=	joystick ftape drm pcmcia
 
 list-multi	:=	
 
@@ -277,7 +277,6 @@
 obj-$(CONFIG_QIC02_TAPE) += tpqic02.o
 
 subdir-$(CONFIG_FTAPE) += ftape
-subdir-$(CONFIG_DRM_OLD) += drm-4.0
 subdir-$(CONFIG_DRM_NEW) += drm
 subdir-$(CONFIG_PCMCIA) += pcmcia
 subdir-$(CONFIG_AGP) += agp
diff -urN drivers/net/wan/Makefile.old drivers/net/wan/Makefile
--- drivers/net/wan/Makefile.old	Mon Sep  2 10:11:13 2002
+++ drivers/net/wan/Makefile	Tue Sep  3 11:37:55 2002
@@ -46,8 +46,6 @@
   obj-y += lmc/lmc.o
 endif
 
-subdir-$(CONFIG_ATI_XX20) += 8253x
-
 ifeq ($(CONFIG_ATI_XX20),y)
   obj-y += 8253x/ASLX.o
 endif
diff -urN drivers/usb/Makefile.old drivers/usb/Makefile
--- drivers/usb/Makefile.old	Mon Sep  2 10:12:18 2002
+++ drivers/usb/Makefile	Tue Sep  3 11:39:16 2002
@@ -57,7 +57,6 @@
 ifneq ($(CONFIG_USB_EHCI_HCD),n)
 	usbcore-objs		+= hcd.o
 endif
-subdir-$(CONFIG_USB_EHCI_HCD)	+= hcd
 
 obj-$(CONFIG_USB_MOUSE)		+= usbmouse.o
 obj-$(CONFIG_USB_HID)		+= hid.o
@@ -94,7 +93,7 @@
 obj-$(CONFIG_USB_BRLVGER)	+= brlvger.o
 
 # Object files in subdirectories
-mod-subdirs	:= serial hcd
+mod-subdirs	:= serial
 
 subdir-$(CONFIG_USB_SERIAL)	+= serial
 subdir-$(CONFIG_USB_STORAGE)	+= storage
diff -urN Makefile.old Makefile
--- Makefile.old	Tue Sep  3 06:15:54 2002
+++ Makefile	Tue Sep  3 11:44:30 2002
@@ -35,7 +35,7 @@
 
 AS		= $(CROSS_COMPILE)as
 LD		= $(CROSS_COMPILE)ld
-CC		= $(CROSS_COMPILE)gcc
+CC		= $(CROSS_COMPILE)gcc -DEXPORT_SYMTAB
 CPP		= $(CC) -E
 AR		= $(CROSS_COMPILE)ar
 NM		= $(CROSS_COMPILE)nm