Updated drivers/misc/Makefile for master-master-2008-11-17

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/compat/compat.diff b/compat/compat.diff
index 29aa978046bf3e6e68efe2ad617fd07a5c97a930..48fa75278179a0d5a14f0e8e9d90ca0f8039e439 100644 (file)
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -49,40 +49,6 @@
 -      zd_chip_control_leds(&mac->chip, LED_OFF);
 +      zd_chip_control_leds(&mac->chip, LED_OFF_ZD);
  }
---- a/drivers/misc/Makefile    2008-10-27 09:27:13.000000000 -0700
-+++ b/drivers/misc/Makefile    2008-10-27 09:40:43.000000000 -0700
-@@ -3,31 +3,4 @@
- #
- obj- := misc.o        # Dummy rule to force built-in.o to be made
- 
--obj-$(CONFIG_IBM_ASM)         += ibmasm/
--obj-$(CONFIG_HDPU_FEATURES)   += hdpuftrs/
--obj-$(CONFIG_ASUS_LAPTOP)     += asus-laptop.o
--obj-$(CONFIG_EEEPC_LAPTOP)    += eeepc-laptop.o
--obj-$(CONFIG_MSI_LAPTOP)      += msi-laptop.o
--obj-$(CONFIG_COMPAL_LAPTOP)   += compal-laptop.o
--obj-$(CONFIG_ACER_WMI)                += acer-wmi.o
--obj-$(CONFIG_ATMEL_PWM)               += atmel_pwm.o
--obj-$(CONFIG_ATMEL_SSC)               += atmel-ssc.o
--obj-$(CONFIG_ATMEL_TCLIB)     += atmel_tclib.o
--obj-$(CONFIG_HP_WMI)          += hp-wmi.o
--obj-$(CONFIG_TC1100_WMI)      += tc1100-wmi.o
--obj-$(CONFIG_LKDTM)           += lkdtm.o
--obj-$(CONFIG_TIFM_CORE)               += tifm_core.o
--obj-$(CONFIG_TIFM_7XX1)               += tifm_7xx1.o
--obj-$(CONFIG_PHANTOM)         += phantom.o
--obj-$(CONFIG_SGI_IOC4)                += ioc4.o
--obj-$(CONFIG_SONY_LAPTOP)     += sony-laptop.o
--obj-$(CONFIG_THINKPAD_ACPI)   += thinkpad_acpi.o
--obj-$(CONFIG_FUJITSU_LAPTOP)  += fujitsu-laptop.o
--obj-$(CONFIG_PANASONIC_LAPTOP)        += panasonic-laptop.o
- obj-$(CONFIG_EEPROM_93CX6)    += eeprom_93cx6.o
--obj-$(CONFIG_INTEL_MENLOW)    += intel_menlow.o
--obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o
--obj-$(CONFIG_KGDB_TESTS)      += kgdbts.o
--obj-$(CONFIG_SGI_XP)          += sgi-xp/
--obj-$(CONFIG_SGI_GRU)         += sgi-gru/
--obj-$(CONFIG_HP_ILO)          += hpilo.o
 --- a/drivers/net/usb/Makefile 2008-10-27 09:41:27.000000000 -0700
 +++ b/drivers/net/usb/Makefile 2008-10-27 09:43:01.000000000 -0700
 @@ -2,21 +2,7 @@
@@ -253,3 +219,41 @@ index a0c860f..9c6f214 100644
  obj-$(CONFIG_LIBERTAS)                += libertas/
  
  obj-$(CONFIG_LIBERTAS_THINFIRM)       += libertas_tf/
+diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
+index 817f7f5..0c3f8fd 100644
+--- a/drivers/misc/Makefile
++++ b/drivers/misc/Makefile
+@@ -3,33 +3,4 @@
+ #
+ obj- := misc.o        # Dummy rule to force built-in.o to be made
+ 
+-obj-$(CONFIG_IBM_ASM)         += ibmasm/
+-obj-$(CONFIG_HDPU_FEATURES)   += hdpuftrs/
+-obj-$(CONFIG_ASUS_LAPTOP)     += asus-laptop.o
+-obj-$(CONFIG_EEEPC_LAPTOP)    += eeepc-laptop.o
+-obj-$(CONFIG_MSI_LAPTOP)      += msi-laptop.o
+-obj-$(CONFIG_COMPAL_LAPTOP)   += compal-laptop.o
+-obj-$(CONFIG_ACER_WMI)                += acer-wmi.o
+-obj-$(CONFIG_ATMEL_PWM)               += atmel_pwm.o
+-obj-$(CONFIG_ATMEL_SSC)               += atmel-ssc.o
+-obj-$(CONFIG_ATMEL_TCLIB)     += atmel_tclib.o
+-obj-$(CONFIG_HP_WMI)          += hp-wmi.o
+-obj-$(CONFIG_ICS932S401)      += ics932s401.o
+-obj-$(CONFIG_TC1100_WMI)      += tc1100-wmi.o
+-obj-$(CONFIG_LKDTM)           += lkdtm.o
+-obj-$(CONFIG_TIFM_CORE)               += tifm_core.o
+-obj-$(CONFIG_TIFM_7XX1)               += tifm_7xx1.o
+-obj-$(CONFIG_PHANTOM)         += phantom.o
+-obj-$(CONFIG_SGI_IOC4)                += ioc4.o
+-obj-$(CONFIG_SONY_LAPTOP)     += sony-laptop.o
+-obj-$(CONFIG_THINKPAD_ACPI)   += thinkpad_acpi.o
+-obj-$(CONFIG_FUJITSU_LAPTOP)  += fujitsu-laptop.o
+-obj-$(CONFIG_PANASONIC_LAPTOP)        += panasonic-laptop.o
+ obj-$(CONFIG_EEPROM_93CX6)    += eeprom_93cx6.o
+-obj-$(CONFIG_INTEL_MENLOW)    += intel_menlow.o
+-obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o
+-obj-$(CONFIG_KGDB_TESTS)      += kgdbts.o
+-obj-$(CONFIG_SGI_XP)          += sgi-xp/
+-obj-$(CONFIG_SGI_GRU)         += sgi-gru/
+-obj-$(CONFIG_HP_ILO)          += hpilo.o
+-obj-$(CONFIG_C2PORT)          += c2port/