[MCA] don't include linux/mca-legacy.h from linux/mca.h.

As the functions and definitions in linux/mca-legacy.h are deprecated,
require that users explicitly include linux/mca-legacy.h as needed.

Prior to this change, _all_ users of linux/mca.h (i.e. proper users)
issued a warning at compile time, when the MCA legacy API was enabled.
Now only actual users of the legacy API cause warnings, not all MCA drivers.

diff --git a/include/linux/mca-legacy.h b/include/linux/mca-legacy.h
index e250420ca9c74b90f346e7abda8eeca72f526602..ae5d7bda2773d2fcaa4d85e788f411a22bdc2c00 100644 (file)
--- a/include/linux/mca-legacy.h
+++ b/include/linux/mca-legacy.h
@@ -7,6 +7,8 @@
 #ifndef _LINUX_MCA_LEGACY_H
 #define _LINUX_MCA_LEGACY_H
 
+#include <linux/mca.h>
+
 #warning "MCA legacy - please move your driver to the new sysfs api"
 
 /* MCA_NOTFOUND is an error condition.  The other two indicate

diff --git a/include/linux/mca.h b/include/linux/mca.h
index 88e99ac603eaa8607b40292a7f7e7278227ebdca..b1289a792d54a5595c570e6d526e22b560da2f58 100644 (file)
--- a/include/linux/mca.h
+++ b/include/linux/mca.h
@@ -136,10 +136,6 @@ extern void mca_unregister_driver(struct mca_driver *drv);
 /* WARNING: only called by the boot time device setup */
 extern int mca_register_device(int bus, struct mca_device *mca_dev);
 
-#ifdef CONFIG_MCA_LEGACY
-#include <linux/mca-legacy.h>
-#endif
-
 #ifdef CONFIG_MCA_PROC_FS
 extern void mca_do_proc_init(void);
 extern void mca_set_adapter_procfn(int slot, MCA_ProcFn, void* dev);