diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-18 20:24:13 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-18 20:24:13 +0000 |
commit | ff4e17bc25b735788cbe60f4c83231c47e2929f8 (patch) | |
tree | 4f317d1f4de3bbec467b59bec12303115fe08497 /target/linux/generic-2.6/patches-2.6.22/600-eeprom_93cx6.patch | |
parent | 8b2e13cf021df39b157ede0b067128a2552a9efa (diff) |
[kernel] refresh generic 2.6.22 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11186 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.22/600-eeprom_93cx6.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.22/600-eeprom_93cx6.patch | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.22/600-eeprom_93cx6.patch b/target/linux/generic-2.6/patches-2.6.22/600-eeprom_93cx6.patch index ff23846b4..8a963c284 100644 --- a/target/linux/generic-2.6/patches-2.6.22/600-eeprom_93cx6.patch +++ b/target/linux/generic-2.6/patches-2.6.22/600-eeprom_93cx6.patch @@ -12,10 +12,10 @@ Signed-off-by: Michael Wu <flamingice@sourmilk.net> Signed-off-by: John W. Linville <linville@tuxdriver.com> --- -diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig -index 616eee9..bd601ef 100644 ---- a/drivers/misc/Kconfig -+++ b/drivers/misc/Kconfig +Index: linux-2.6.22.19/drivers/misc/Kconfig +=================================================================== +--- linux-2.6.22.19.orig/drivers/misc/Kconfig ++++ linux-2.6.22.19/drivers/misc/Kconfig @@ -34,6 +34,11 @@ config PHANTOM If you choose to build module, its name will be phantom. If unsure, say N here. @@ -34,20 +34,19 @@ index 616eee9..bd601ef 100644 - endmenu -diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile -index 8abbf2f..b5ce0e3 100644 ---- a/drivers/misc/Makefile -+++ b/drivers/misc/Makefile +Index: linux-2.6.22.19/drivers/misc/Makefile +=================================================================== +--- linux-2.6.22.19.orig/drivers/misc/Makefile ++++ linux-2.6.22.19/drivers/misc/Makefile @@ -14,3 +14,4 @@ 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_EEPROM_93CX6) += eeprom_93cx6.o -diff --git a/drivers/misc/eeprom_93cx6.c b/drivers/misc/eeprom_93cx6.c -new file mode 100644 -index 0000000..bfcb434 +Index: linux-2.6.22.19/drivers/misc/eeprom_93cx6.c +=================================================================== --- /dev/null -+++ b/drivers/misc/eeprom_93cx6.c ++++ linux-2.6.22.19/drivers/misc/eeprom_93cx6.c @@ -0,0 +1,229 @@ +/* + Copyright (C) 2004 - 2006 rt2x00 SourceForge Project @@ -278,11 +277,10 @@ index 0000000..bfcb434 +} +EXPORT_SYMBOL_GPL(eeprom_93cx6_multiread); + -diff --git a/include/linux/eeprom_93cx6.h b/include/linux/eeprom_93cx6.h -new file mode 100644 -index 0000000..d774b77 +Index: linux-2.6.22.19/include/linux/eeprom_93cx6.h +=================================================================== --- /dev/null -+++ b/include/linux/eeprom_93cx6.h ++++ linux-2.6.22.19/include/linux/eeprom_93cx6.h @@ -0,0 +1,72 @@ +/* + Copyright (C) 2004 - 2006 rt2x00 SourceForge Project |