diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2006-12-06 23:38:24 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:39 -0500 |
commit | f13a603786819cc8f2eef6a89bc4a6c88f40ee60 (patch) | |
tree | 3373780ac85888ff3faba64631e65810b061f34e /drivers/message/i2o/i2o_config.c | |
parent | 9d69b7d3d115d0db3ddd87f09e496db7ecf72650 (diff) |
[PATCH] I2O: fix I2O_CONFIG without Adaptec extension
With I2O_CONFIG=y and I2O_EXT_ADAPTEC=n, kernel build gets:
drivers/message/i2o/i2o_config.c:1115: error: 'i2o_cfg_compat_ioctl' undeclared here (not in a function)
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/message/i2o/i2o_config.c')
-rw-r--r-- | drivers/message/i2o/i2o_config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c index 685d7a450720..1de30d711671 100644 --- a/drivers/message/i2o/i2o_config.c +++ b/drivers/message/i2o/i2o_config.c | |||
@@ -520,7 +520,6 @@ static int i2o_cfg_evt_get(unsigned long arg, struct file *fp) | |||
520 | return 0; | 520 | return 0; |
521 | } | 521 | } |
522 | 522 | ||
523 | #ifdef CONFIG_I2O_EXT_ADAPTEC | ||
524 | #ifdef CONFIG_COMPAT | 523 | #ifdef CONFIG_COMPAT |
525 | static int i2o_cfg_passthru32(struct file *file, unsigned cmnd, | 524 | static int i2o_cfg_passthru32(struct file *file, unsigned cmnd, |
526 | unsigned long arg) | 525 | unsigned long arg) |
@@ -763,6 +762,7 @@ static long i2o_cfg_compat_ioctl(struct file *file, unsigned cmd, | |||
763 | 762 | ||
764 | #endif | 763 | #endif |
765 | 764 | ||
765 | #ifdef CONFIG_I2O_EXT_ADAPTEC | ||
766 | static int i2o_cfg_passthru(unsigned long arg) | 766 | static int i2o_cfg_passthru(unsigned long arg) |
767 | { | 767 | { |
768 | struct i2o_cmd_passthru __user *cmd = | 768 | struct i2o_cmd_passthru __user *cmd = |