The patch titled
I2O: fix I2O_CONFIG without Adaptec extension
has been added to the -mm tree. Its filename is
i2o-fix-i2o_config-without-adaptec-extension.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: I2O: fix I2O_CONFIG without Adaptec extension
From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
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@xxxxxxxxxx>
Cc: Markus Lidel <Markus.Lidel@xxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/message/i2o/i2o_config.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/message/i2o/i2o_config.c~i2o-fix-i2o_config-without-adaptec-extension drivers/message/i2o/i2o_config.c
--- a/drivers/message/i2o/i2o_config.c~i2o-fix-i2o_config-without-adaptec-extension
+++ a/drivers/message/i2o/i2o_config.c
@@ -520,7 +520,6 @@ static int i2o_cfg_evt_get(unsigned long
return 0;
}
-#ifdef CONFIG_I2O_EXT_ADAPTEC
#ifdef CONFIG_COMPAT
static int i2o_cfg_passthru32(struct file *file, unsigned cmnd,
unsigned long arg)
@@ -763,6 +762,7 @@ static long i2o_cfg_compat_ioctl(struct
#endif
+#ifdef CONFIG_I2O_EXT_ADAPTEC
static int i2o_cfg_passthru(unsigned long arg)
{
struct i2o_cmd_passthru __user *cmd =
_
Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are
origin.patch
debugfs-add-header-file.patch
git-acpi.patch
korg1212-fix-printk-format-warning.patch
cpufreq-select-consistently-re-2619-rc5-mm1.patch
git-ieee1394.patch
git-infiniband.patch
mtd-fix-printk-format-warning.patch
git-ocfs2.patch
parisc-fix-module_param-iommu-permission.patch
fuse-fix-compile-without-config_block.patch
tifm-fix-null-ptr-and-style.patch
kconfig-printk_time-depends-on-printk.patch
hpfs-fix-printk-format-warnings.patch
i2o-handle-__copy_from_user.patch
i2o-fix-i2o_config-without-adaptec-extension.patch
generic-bug-implementation-handle-bug=n.patch
visws-sgivwfb-is-module-needs-exports.patch
extend-notifier_call_chain-to-count-nr_calls-made-fixes.patch
profile_likely-export-do_check_likely.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
