diff options
| author | Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> | 2008-02-15 16:31:04 -0500 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> | 2008-02-15 16:31:04 -0500 |
| commit | 8bdc53cb4d6477f0c76a81ed054208019c52018b (patch) | |
| tree | 2a32c81a5e8ff70210de3727fc443c9863c9343f | |
| parent | 076e32404c2dd21d9262b0efc11bdca2949d9365 (diff) | |
| download | compat-wireless-2.6-old-8bdc53cb4d6477f0c76a81ed054208019c52018b.tar.gz | |
compat.diff needs fixing for changes in drivers/misc/Makefile
Signed-off-by: Luis R. Rodriguez <mcgrof@winlab.rutgers.edu>
| -rw-r--r-- | compat/compat.diff | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/compat/compat.diff b/compat/compat.diff index da06755..c857ea2 100644 --- a/compat/compat.diff +++ b/compat/compat.diff @@ -115,26 +115,6 @@ static struct bus_type ssb_bustype = { .name = "ssb", ---- a/drivers/misc/Makefile 2007-11-15 22:15:29.000000000 -0500 -+++ b/drivers/misc/Makefile 2007-11-15 22:15:45.000000000 -0500 -@@ -3,17 +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_MSI_LAPTOP) += msi-laptop.o --obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o --obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.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_EEPROM_93CX6) += eeprom_93cx6.o --- a/net/mac80211/util.c 2007-11-27 18:13:44.000000000 -0500 +++ b/net/mac80211/util.c 2007-11-27 18:13:45.000000000 -0500 @@ -20,7 +20,9 @@ @@ -628,3 +608,28 @@ mdev->set_multicast_list = ieee80211_master_set_multicast_list; sdata->vif.type = IEEE80211_IF_TYPE_AP; +--- a/drivers/misc/Makefile 2008-02-15 16:29:43.000000000 -0500 ++++ b/drivers/misc/Makefile 2008-02-15 16:29:24.000000000 -0500 +@@ -3,22 +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_MSI_LAPTOP) += msi-laptop.o +-obj-$(CONFIG_ACER_WMI) += acer-wmi.o +-obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o +-obj-$(CONFIG_ATMEL_PWM) += atmel_pwm.o +-obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.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_EEPROM_93CX6) += eeprom_93cx6.o +-obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o +-obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o |