Update: eeprom_93cx6 changed directory

diff --git a/Makefile b/Makefile
index 6a5eff4838fa895e3de40d3513b5ee5e76cac108..095dc18c5912c2d8b0905c42ac1b27adef1a3855 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ obj-y := net/wireless/ net/mac80211/
 ifeq ($(ONLY_CORE),)
 obj-$(CONFIG_B44) += drivers/net/b44.o
 obj-y += drivers/ssb/ \
-       drivers/misc/ \
+       drivers/misc/eeprom/ \
        drivers/net/usb/ \
        drivers/net/wireless/
 endif
@@ -148,6 +148,7 @@ uninstall:
        @rm -rf $(KLIB)/$(KMODDIR)/drivers/net/wireless/
        @# Lets only remove the stuff we are sure we are providing
        @# on the misc directory.
+       @rm -f $(KLIB)/$(KMODDIR)/drivers/misc/eeprom/eeprom_93cx6.ko
        @rm -f $(KLIB)/$(KMODDIR)/drivers/misc/eeprom_93cx6.ko
        @/sbin/depmod -ae
        @echo

diff --git a/compat/compat.diff b/compat/compat.diff
index a082da4e1b819490987b3345e415093bfeca3feb..a497206c7eafb4eb7f019b07143d00bf76162d06 100644 (file)
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -153,30 +153,13 @@ index a0c860f..9c6f214 100644
  obj-$(CONFIG_LIBERTAS)                += libertas/
  
  obj-$(CONFIG_LIBERTAS_THINFIRM)       += libertas_tf/
---- a/drivers/misc/Makefile    2009-01-22 07:51:17.000000000 -0800
-+++ b/drivers/misc/Makefile    2009-01-22 07:51:26.000000000 -0800
-@@ -2,21 +2,4 @@
- # Makefile for misc devices that really don't fit anywhere else.
- #
- 
--obj-$(CONFIG_IBM_ASM)         += ibmasm/
--obj-$(CONFIG_HDPU_FEATURES)   += hdpuftrs/
--obj-$(CONFIG_ATMEL_PWM)               += atmel_pwm.o
--obj-$(CONFIG_ATMEL_SSC)               += atmel-ssc.o
--obj-$(CONFIG_ATMEL_TCLIB)     += atmel_tclib.o
--obj-$(CONFIG_ICS932S401)      += ics932s401.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
+--- a/drivers/misc/eeprom/Makefile     2009-01-22 07:51:17.000000000 -0800
++++ b/drivers/misc/eeprom/Makefile     2009-01-22 07:51:26.000000000 -0800
+@@ -1,4 +1 @@
+-obj-$(CONFIG_EEPROM_AT24)     += at24.o
+-obj-$(CONFIG_EEPROM_AT25)     += at25.o
+-obj-$(CONFIG_EEPROM_LEGACY)   += eeprom.o
  obj-$(CONFIG_EEPROM_93CX6)    += eeprom_93cx6.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/
 --- a/drivers/net/wireless/zd1211rw/zd_chip.c  2009-01-15 16:35:33.000000000 -0800
 +++ b/drivers/net/wireless/zd1211rw/zd_chip.c  2009-01-15 16:35:33.000000000 -0800
 @@ -1278,7 +1278,7 @@

diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index 7506ad8a80370d0fd2304c00c67cec580e90c177..5fa23c0a3abe24d5eedc8b43b97688ecfd510dd0 100755 (executable)
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -125,9 +125,9 @@ DIR="drivers/net"
 cp $GIT_TREE/$DIR/b44.[ch] $DIR
 
 # Misc
-mkdir -p drivers/misc/
-cp $GIT_TREE/drivers/misc/eeprom_93cx6.c drivers/misc/
-cp $GIT_TREE/drivers/misc/Makefile drivers/misc/
+mkdir -p drivers/misc/eeprom/
+cp $GIT_TREE/drivers/misc/eeprom/eeprom_93cx6.c drivers/misc/eeprom/
+cp $GIT_TREE/drivers/misc/eeprom/Makefile drivers/misc/eeprom/
 
 DIR="drivers/net/wireless"
 # Drivers part of the wireless directory