From a186eee4a73ebb0f04849da89fc58330a61046b3 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jgarzik@redhat.com>
Date: Mon, 2 Dec 2002 08:15:12 -0500
Subject: [i2c] add new hardware ids, update rcsid

---
 include/linux/i2c-id.h | 10 +++++++++-
 include/linux/i2c.h    |  1 -
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'include/linux')

diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index a914758c8f33..8a52e78b89f0 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -20,7 +20,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.		     */
 /* ------------------------------------------------------------------------- */
 
-/* $Id: i2c-id.h,v 1.52 2002/07/10 13:28:44 abz Exp $ */
+/* $Id: i2c-id.h,v 1.56 2002/10/13 15:50:02 mds Exp $ */
 
 #ifndef I2C_ID_H
 #define I2C_ID_H
@@ -143,6 +143,8 @@
 #define I2C_DRIVERID_SMSC47M1 1031
 #define I2C_DRIVERID_VT1211 1032
 #define I2C_DRIVERID_LM92 1033
+#define I2C_DRIVERID_VT8231 1034
+#define I2C_DRIVERID_SMARTBATT 1035
 
 /*
  * ---- Adapter types ----------------------------------------------------
@@ -161,6 +163,7 @@
 #define I2C_ALGO_ACB 	0x070000	/* ACCESS.bus algorithm         */
 #define I2C_ALGO_IIC    0x080000 	/* ITE IIC bus */
 #define I2C_ALGO_SAA7134 0x090000
+#define I2C_ALGO_MPC824X 0x0a0000	/* Motorola 8240 / 8245         */
 #define I2C_ALGO_EC     0x100000        /* ACPI embedded controller     */
 
 #define I2C_ALGO_MPC8XX 0x110000	/* MPC8xx PowerPC I2C algorithm */
@@ -206,6 +209,9 @@
 /* --- ACPI Embedded controller algorithms                              */
 #define I2C_HW_ACPI_EC          0x00
 
+/* --- MPC824x PowerPC adapters						*/
+#define I2C_HW_MPC824X 0x00	/* Motorola 8240 / 8245                 */
+
 /* --- MPC8xx PowerPC adapters						*/
 #define I2C_HW_MPC8XX_EPON 0x00	/* Eponymous MPC8xx I2C adapter 	*/
 
@@ -225,6 +231,8 @@
 #define I2C_HW_SMBUS_AMD756	0x05
 #define I2C_HW_SMBUS_SIS5595	0x06
 #define I2C_HW_SMBUS_ALI1535	0x07
+#define I2C_HW_SMBUS_SIS630	0x08
+#define I2C_HW_SMBUS_SIS645	0x09
 
 /* --- ISA pseudo-adapter						*/
 #define I2C_HW_ISA 0x00
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 36c694e141d9..ab69e01bc8c3 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -66,7 +66,6 @@ struct i2c_driver;
 struct i2c_client_address_data;
 union i2c_smbus_data;
 
-
 /*
  * The master routines are the ones normally used to transmit data to devices
  * on a bus (or read from them). Apart from two basic transfer functions to 
-- 
cgit v1.2.3


From 35c8838f3ec342c5ded92fe1bf85bb03a781c0e5 Mon Sep 17 00:00:00 2001
From: William Lee Irwin III <wli@holomorphy.com>
Date: Mon, 2 Dec 2002 11:19:50 -0500
Subject: Add __exit_p() to match existing __devexit_p().

This patch fixes de2104x net driver up by doing the following things:
(1) add __exit_p() to <linux/init.h>
(2) add the unused attributed to __exit routines for non-modules
(3) use __exit_p() to refer to de_remove_one()
---
 drivers/net/tulip/de2104x.c |  3 +--
 include/linux/init.h        | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'include/linux')

diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 49f93dd88ce6..db79b811e510 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -2217,8 +2217,7 @@ static struct pci_driver de_driver = {
 	.name		= DRV_NAME,
 	.id_table	= de_pci_tbl,
 	.probe		= de_init_one,
-#warning only here to fix build.  should be __exit_p not __devexit_p.
-	.remove		= __devexit_p(de_remove_one),
+	.remove		= __exit_p(de_remove_one),
 #ifdef CONFIG_PM
 	.suspend	= de_suspend,
 	.resume		= de_resume,
diff --git a/include/linux/init.h b/include/linux/init.h
index e2bf29a635bf..26a518d9cfc1 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -42,10 +42,15 @@
    discard it in modules) */
 #define __init		__attribute__ ((__section__ (".init.text")))
 #define __initdata	__attribute__ ((__section__ (".init.data")))
-#define __exit		__attribute__ ((__section__(".exit.text")))
 #define __exitdata	__attribute__ ((__section__(".exit.data")))
 #define __exit_call	__attribute__ ((unused,__section__ (".exitcall.exit")))
 
+#ifdef MODULE
+#define __exit		__attribute__ ((__section__(".exit.text")))
+#else
+#define __exit		__attribute__ ((unused,__section__(".exit.text")))
+#endif
+
 /* For assembly routines */
 #define __INIT		.section	".init.text","ax"
 #define __FINIT		.previous
@@ -185,4 +190,10 @@ extern struct kernel_param __setup_start, __setup_end;
 #define __devexit_p(x) NULL
 #endif
 
+#ifdef MODULE
+#define __exit_p(x) x
+#else
+#define __exit_p(x) NULL
+#endif
+
 #endif /* _LINUX_INIT_H */
-- 
cgit v1.2.3