diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2003-01-14 20:09:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2003-01-14 20:09:18 -0800 |
| commit | af9df9e3238485c4645b98fd2d29d1539253e2ab (patch) | |
| tree | 21a8808bb21fbb5d0d493bef29b70da4847351b9 /include/linux | |
| parent | b197558493cea43fb4f524ed05a5bf41d109babb (diff) | |
| parent | a0b7ca57e0fb47f65ea6b6680823d8fdd3be8a9f (diff) | |
Merge
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cpufreq.h | 2 | ||||
| -rw-r--r-- | include/linux/fs.h | 2 | ||||
| -rw-r--r-- | include/linux/i2c.h | 8 |
3 files changed, 1 insertions, 11 deletions
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 9226268ef4ef..a75d268c4f0e 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -130,7 +130,7 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data); int cpufreq_unregister_driver(struct cpufreq_driver *driver_data); /* deprecated */ #define cpufreq_register(x) cpufreq_register_driver(x) -#define cpufreq_unregister(x) cpufreq_unregister_driver(NULL) +#define cpufreq_unregister() cpufreq_unregister_driver(NULL) void cpufreq_notify_transition(struct cpufreq_freqs *freqs, unsigned int state); diff --git a/include/linux/fs.h b/include/linux/fs.h index 3d098c717fc1..7dafaeb0b1cc 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -992,8 +992,6 @@ extern struct vfsmount *kern_mount(struct file_system_type *); extern int may_umount(struct vfsmount *); extern long do_mount(char *, char *, char *, unsigned long, void *); -#define kern_umount mntput - extern int vfs_statfs(struct super_block *, struct statfs *); /* Return value for VFS lock functions - tells locks.c to lock conventionally diff --git a/include/linux/i2c.h b/include/linux/i2c.h index c176ca672cc7..de3dc122f059 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -484,14 +484,6 @@ union i2c_smbus_data { #define I2C_MAJOR 89 /* Device major number */ -# ifndef NULL -# define NULL ( (void *) 0 ) -# endif - -# ifndef ENODEV -# include <asm/errno.h> -# endif - /* These defines are used for probing i2c client addresses */ /* Default fill of many variables */ #define I2C_CLIENT_DEFAULTS {I2C_CLIENT_END, I2C_CLIENT_END, I2C_CLIENT_END, \ |