aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-2.6.23/294-eeprom_new_notifier.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.23/294-eeprom_new_notifier.patch')
-rw-r--r--target/linux/ixp4xx/patches-2.6.23/294-eeprom_new_notifier.patch27
1 files changed, 15 insertions, 12 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.23/294-eeprom_new_notifier.patch b/target/linux/ixp4xx/patches-2.6.23/294-eeprom_new_notifier.patch
index 4aa7a988be..f91e7784ff 100644
--- a/target/linux/ixp4xx/patches-2.6.23/294-eeprom_new_notifier.patch
+++ b/target/linux/ixp4xx/patches-2.6.23/294-eeprom_new_notifier.patch
@@ -1,6 +1,7 @@
-diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c/chips/eeprom.c
---- linux-2.6.23.orig/drivers/i2c/chips/eeprom.c 2007-10-09 15:31:38.000000000 -0500
-+++ linux-2.6.23/drivers/i2c/chips/eeprom.c 2007-10-11 00:57:25.000000000 -0500
+Index: linux-2.6.23.17/drivers/i2c/chips/eeprom.c
+===================================================================
+--- linux-2.6.23.17.orig/drivers/i2c/chips/eeprom.c
++++ linux-2.6.23.17/drivers/i2c/chips/eeprom.c
@@ -33,6 +33,8 @@
#include <linux/jiffies.h>
#include <linux/i2c.h>
@@ -38,7 +39,7 @@ diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c
static int eeprom_attach_adapter(struct i2c_adapter *adapter);
static int eeprom_detect(struct i2c_adapter *adapter, int address, int kind);
-@@ -191,6 +174,7 @@ static int eeprom_detect(struct i2c_adap
+@@ -198,6 +181,7 @@ static int eeprom_detect(struct i2c_adap
data->valid = 0;
mutex_init(&data->update_lock);
data->nature = UNKNOWN;
@@ -46,7 +47,7 @@ diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c
/* Tell the I2C layer a new client has arrived */
if ((err = i2c_attach_client(new_client)))
-@@ -214,6 +198,9 @@ static int eeprom_detect(struct i2c_adap
+@@ -225,6 +209,9 @@ static int eeprom_detect(struct i2c_adap
if (err)
goto exit_detach;
@@ -56,7 +57,7 @@ diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c
return 0;
exit_detach:
-@@ -239,6 +226,41 @@ static int eeprom_detach_client(struct i
+@@ -250,6 +237,41 @@ static int eeprom_detach_client(struct i
return 0;
}
@@ -98,9 +99,10 @@ diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c
static int __init eeprom_init(void)
{
return i2c_add_driver(&eeprom_driver);
-diff -uprN linux-2.6.23.orig/include/linux/eeprom.h linux-2.6.23/include/linux/eeprom.h
---- linux-2.6.23.orig/include/linux/eeprom.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-2.6.23/include/linux/eeprom.h 2007-10-11 00:57:25.000000000 -0500
+Index: linux-2.6.23.17/include/linux/eeprom.h
+===================================================================
+--- /dev/null
++++ linux-2.6.23.17/include/linux/eeprom.h
@@ -0,0 +1,71 @@
+#ifndef _LINUX_EEPROM_H
+#define _LINUX_EEPROM_H
@@ -173,9 +175,10 @@ diff -uprN linux-2.6.23.orig/include/linux/eeprom.h linux-2.6.23/include/linux/e
+extern int unregister_eeprom_notifier(struct notifier_block *nb);
+
+#endif /* _LINUX_EEPROM_H */
-diff -uprN linux-2.6.23.orig/include/linux/notifier.h linux-2.6.23/include/linux/notifier.h
---- linux-2.6.23.orig/include/linux/notifier.h 2007-10-09 15:31:38.000000000 -0500
-+++ linux-2.6.23/include/linux/notifier.h 2007-10-11 00:57:25.000000000 -0500
+Index: linux-2.6.23.17/include/linux/notifier.h
+===================================================================
+--- linux-2.6.23.17.orig/include/linux/notifier.h
++++ linux-2.6.23.17/include/linux/notifier.h
@@ -231,5 +231,8 @@ static inline int notifier_to_errno(int
#define PM_SUSPEND_PREPARE 0x0003 /* Going to suspend the system */
#define PM_POST_SUSPEND 0x0004 /* Suspend finished */