diff options
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/i2c-algo-bit.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/i2c-algo-pcf.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/i2c-core.c | 19 | ||||
| -rw-r--r-- | drivers/i2c/i2c-dev.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/i2c-elektor.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/i2c-elv.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/i2c-pcf8584.h | 2 |
7 files changed, 7 insertions, 24 deletions
diff --git a/drivers/i2c/i2c-algo-bit.c b/drivers/i2c/i2c-algo-bit.c index c4ecf7daece9..48d6c6492c8a 100644 --- a/drivers/i2c/i2c-algo-bit.c +++ b/drivers/i2c/i2c-algo-bit.c @@ -26,7 +26,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/delay.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/version.h> #include <linux/init.h> #include <asm/uaccess.h> diff --git a/drivers/i2c/i2c-algo-pcf.c b/drivers/i2c/i2c-algo-pcf.c index cadd051b7350..5618b7557f17 100644 --- a/drivers/i2c/i2c-algo-pcf.c +++ b/drivers/i2c/i2c-algo-pcf.c @@ -29,7 +29,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/delay.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/version.h> #include <linux/init.h> #include <asm/uaccess.h> diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 84e6003640a4..b9db448d274b 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -25,7 +25,7 @@ #include <linux/module.h> #include <linux/kernel.h> #include <linux/errno.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/proc_fs.h> #include <linux/config.h> @@ -1277,31 +1277,14 @@ static int __init i2c_init(void) } #ifndef MODULE -#ifdef CONFIG_I2C_CHARDEV extern int i2c_dev_init(void); -#endif -#ifdef CONFIG_I2C_ALGOBIT extern int i2c_algo_bit_init(void); -#endif -#ifdef CONFIG_I2C_BITLP extern int i2c_bitlp_init(void); -#endif -#ifdef CONFIG_I2C_BITELV extern int i2c_bitelv_init(void); -#endif -#ifdef CONFIG_I2C_BITVELLE extern int i2c_bitvelle_init(void); -#endif -#ifdef CONFIG_I2C_BITVIA extern int i2c_bitvia_init(void); -#endif - -#ifdef CONFIG_I2C_ALGOPCF extern int i2c_algo_pcf_init(void); -#endif -#ifdef CONFIG_I2C_PCFISA extern int i2c_pcfisa_init(void); -#endif /* This is needed for automatic patch generation: sensors code starts here */ /* This is needed for automatic patch generation: sensors code ends here */ diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c index cf6afc575ce2..b647b16ad14c 100644 --- a/drivers/i2c/i2c-dev.c +++ b/drivers/i2c/i2c-dev.c @@ -34,7 +34,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/fs.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/version.h> #if LINUX_KERNEL_VERSION >= KERNEL_VERSION(2,4,0) #include <linux/smp_lock.h> diff --git a/drivers/i2c/i2c-elektor.c b/drivers/i2c/i2c-elektor.c index 9e82fbdf4026..590f42ff2c62 100644 --- a/drivers/i2c/i2c-elektor.c +++ b/drivers/i2c/i2c-elektor.c @@ -28,7 +28,7 @@ #include <linux/ioport.h> #include <linux/module.h> #include <linux/delay.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/version.h> #include <linux/init.h> #include <asm/irq.h> diff --git a/drivers/i2c/i2c-elv.c b/drivers/i2c/i2c-elv.c index adae40c4ce95..0fcd9a65b35f 100644 --- a/drivers/i2c/i2c-elv.c +++ b/drivers/i2c/i2c-elv.c @@ -26,7 +26,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/delay.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/version.h> #include <linux/init.h> diff --git a/drivers/i2c/i2c-pcf8584.h b/drivers/i2c/i2c-pcf8584.h index 9f0874012f91..4908ebae5526 100644 --- a/drivers/i2c/i2c-pcf8584.h +++ b/drivers/i2c/i2c-pcf8584.h @@ -75,4 +75,4 @@ #define I2C_PCF_INTREG I2C_PCF_ES2 #define I2C_PCF_CLKREG I2C_PCF_ES1 -#endif I2C_PCF8584_H +#endif /* I2C_PCF8584_H */ |