diff options
| author | Greg KH <greg@press.(none)> | 2005-09-30 16:21:36 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-30 16:21:36 -0700 |
| commit | 98b959abd615ea9ae82565830170535ba34d18d8 (patch) | |
| tree | 020002c888ee923cf1a02c87a2189b185448538a /i2c | |
| parent | f551927abcaf066f1dd885802a405450f534522f (diff) | |
| download | patches-98b959abd615ea9ae82565830170535ba34d18d8.tar.gz | |
2.6.14-rc3 update (first part)
Diffstat (limited to 'i2c')
| -rw-r--r-- | i2c/i2c-device-id.patch | 22 | ||||
| -rw-r--r-- | i2c/i2c-viapro-01.patch | 7 |
2 files changed, 15 insertions, 14 deletions
diff --git a/i2c/i2c-device-id.patch b/i2c/i2c-device-id.patch index 5e798a95ce7577..0a81c52b1eaa5d 100644 --- a/i2c/i2c-device-id.patch +++ b/i2c/i2c-device-id.patch @@ -15,8 +15,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> scripts/mod/file2alias.c | 10 ++++++++++ 4 files changed, 29 insertions(+) ---- gregkh-2.6.orig/drivers/hwmon/lm75.c 2005-09-08 09:07:11.000000000 -0700 -+++ gregkh-2.6/drivers/hwmon/lm75.c 2005-09-08 09:42:25.000000000 -0700 +--- gregkh-2.6.orig/drivers/hwmon/lm75.c 2005-09-30 16:19:51.000000000 -0700 ++++ gregkh-2.6/drivers/hwmon/lm75.c 2005-09-30 16:20:28.000000000 -0700 @@ -32,6 +32,19 @@ static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, I2C_CLIENT_END }; @@ -37,9 +37,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Insmod parameters */ I2C_CLIENT_INSMOD_1(lm75); ---- gregkh-2.6.orig/include/linux/mod_devicetable.h 2005-09-08 09:07:29.000000000 -0700 -+++ gregkh-2.6/include/linux/mod_devicetable.h 2005-09-08 09:42:25.000000000 -0700 -@@ -243,4 +243,9 @@ struct pcmcia_device_id { +--- gregkh-2.6.orig/include/linux/mod_devicetable.h 2005-09-30 16:19:51.000000000 -0700 ++++ gregkh-2.6/include/linux/mod_devicetable.h 2005-09-30 16:20:28.000000000 -0700 +@@ -244,4 +244,9 @@ struct pcmcia_device_id { #define PCMCIA_DEV_ID_MATCH_FAKE_CIS 0x0200 #define PCMCIA_DEV_ID_MATCH_ANONYMOUS 0x0400 @@ -49,9 +49,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +}; + #endif /* LINUX_MOD_DEVICETABLE_H */ ---- gregkh-2.6.orig/scripts/mod/file2alias.c 2005-09-08 09:07:39.000000000 -0700 -+++ gregkh-2.6/scripts/mod/file2alias.c 2005-09-08 09:43:12.000000000 -0700 -@@ -357,6 +357,13 @@ static int do_vio_entry(const char *file +--- gregkh-2.6.orig/scripts/mod/file2alias.c 2005-09-30 16:19:51.000000000 -0700 ++++ gregkh-2.6/scripts/mod/file2alias.c 2005-09-30 16:20:28.000000000 -0700 +@@ -359,6 +359,13 @@ static int do_vio_entry(const char *file return 1; } @@ -65,7 +65,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Ignore any prefix, eg. v850 prepends _ */ static inline int sym_is(const char *symbol, const char *name) { -@@ -441,6 +448,9 @@ void handle_moddevtable(struct module *m +@@ -443,6 +450,9 @@ void handle_moddevtable(struct module *m else if (sym_is(symname, "__mod_vio_device_table")) do_table(symval, sym->st_size, sizeof(struct vio_device_id), do_vio_entry, mod); @@ -75,8 +75,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } ---- gregkh-2.6.orig/include/linux/i2c.h 2005-09-08 09:07:29.000000000 -0700 -+++ gregkh-2.6/include/linux/i2c.h 2005-09-08 09:42:25.000000000 -0700 +--- gregkh-2.6.orig/include/linux/i2c.h 2005-09-30 16:20:20.000000000 -0700 ++++ gregkh-2.6/include/linux/i2c.h 2005-09-30 16:20:28.000000000 -0700 @@ -31,6 +31,7 @@ #include <linux/module.h> #include <linux/types.h> diff --git a/i2c/i2c-viapro-01.patch b/i2c/i2c-viapro-01.patch index 7ffe67435660b7..08c1cdc462c716 100644 --- a/i2c/i2c-viapro-01.patch +++ b/i2c/i2c-viapro-01.patch @@ -14,9 +14,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) ---- gregkh-2.6.orig/MAINTAINERS 2005-09-28 15:53:19.000000000 -0700 -+++ gregkh-2.6/MAINTAINERS 2005-09-28 15:54:04.000000000 -0700 -@@ -2704,6 +2704,12 @@ +--- +--- gregkh-2.6.orig/MAINTAINERS 2005-09-30 16:20:07.000000000 -0700 ++++ gregkh-2.6/MAINTAINERS 2005-09-30 16:20:21.000000000 -0700 +@@ -2727,6 +2727,12 @@ P: Roger Luethi M: rl@hellgate.ch S: Maintained |