diff options
| author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-30 16:32:35 +0000 |
|---|---|---|
| committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-30 16:32:35 +0000 |
| commit | 30d336cfc5e67d66ed19a84223a9215f42c30135 (patch) | |
| tree | a44f1bdee35d9e09d2e6e49a8f3109228aa2a7cf /target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch | |
| parent | 48983d35d70395a391026c8f8bb1f44165ce058e (diff) | |
refresh ixp4xx patches to match upstream style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11297 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch b/target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch index 5849a7b1a..165ca6a80 100644 --- a/target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch +++ b/target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.25.4/drivers/i2c/chips/eeprom.c -=================================================================== ---- linux-2.6.25.4.orig/drivers/i2c/chips/eeprom.c -+++ linux-2.6.25.4/drivers/i2c/chips/eeprom.c +--- a/drivers/i2c/chips/eeprom.c ++++ b/drivers/i2c/chips/eeprom.c @@ -33,6 +33,8 @@ #include <linux/jiffies.h> #include <linux/i2c.h> @@ -11,7 +9,7 @@ Index: linux-2.6.25.4/drivers/i2c/chips/eeprom.c /* Addresses to scan */ static const unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54, -@@ -41,26 +43,7 @@ static const unsigned short normal_i2c[] +@@ -41,26 +43,7 @@ /* Insmod parameters */ I2C_CLIENT_INSMOD_1(eeprom); @@ -39,7 +37,7 @@ Index: linux-2.6.25.4/drivers/i2c/chips/eeprom.c static int eeprom_attach_adapter(struct i2c_adapter *adapter); static int eeprom_detect(struct i2c_adapter *adapter, int address, int kind); -@@ -197,6 +180,7 @@ static int eeprom_detect(struct i2c_adap +@@ -197,6 +180,7 @@ data->valid = 0; mutex_init(&data->update_lock); data->nature = UNKNOWN; @@ -47,7 +45,7 @@ Index: linux-2.6.25.4/drivers/i2c/chips/eeprom.c /* Tell the I2C layer a new client has arrived */ if ((err = i2c_attach_client(new_client))) -@@ -224,6 +208,9 @@ static int eeprom_detect(struct i2c_adap +@@ -224,6 +208,9 @@ if (err) goto exit_detach; @@ -57,7 +55,7 @@ Index: linux-2.6.25.4/drivers/i2c/chips/eeprom.c return 0; exit_detach: -@@ -249,6 +236,41 @@ static int eeprom_detach_client(struct i +@@ -249,6 +236,41 @@ return 0; } @@ -99,10 +97,8 @@ Index: linux-2.6.25.4/drivers/i2c/chips/eeprom.c static int __init eeprom_init(void) { return i2c_add_driver(&eeprom_driver); -Index: linux-2.6.25.4/include/linux/eeprom.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/eeprom.h ++++ b/include/linux/eeprom.h @@ -0,0 +1,71 @@ +#ifndef _LINUX_EEPROM_H +#define _LINUX_EEPROM_H @@ -175,11 +171,9 @@ Index: linux-2.6.25.4/include/linux/eeprom.h +extern int unregister_eeprom_notifier(struct notifier_block *nb); + +#endif /* _LINUX_EEPROM_H */ -Index: linux-2.6.25.4/include/linux/notifier.h -=================================================================== ---- linux-2.6.25.4.orig/include/linux/notifier.h -+++ linux-2.6.25.4/include/linux/notifier.h -@@ -248,5 +248,8 @@ extern struct blocking_notifier_head reb +--- a/include/linux/notifier.h ++++ b/include/linux/notifier.h +@@ -248,5 +248,8 @@ #define VT_WRITE 0x0003 /* A char got output */ #define VT_UPDATE 0x0004 /* A bigger update occurred */ |