7 -obj-$(CONFIG_COMPAT_FIRMWARE_CLASS) += compat_firmware_class.o
8 +ifdef CONFIG_COMPAT_FIRMWARE_CLASS
9 + compat-y += compat_firmware_class.o
12 obj-$(CONFIG_COMPAT_NET_SCH_CODEL) += sch_codel.o
14 sch_fq_codel-y = sch_fq_codel_core.o flow_dissector.o
15 --- a/compat/compat_firmware_class.c
16 +++ b/compat/compat_firmware_class.c
17 @@ -741,19 +741,16 @@ compat_request_firmware_nowait(
21 -static int __init firmware_class_init(void)
22 +int __init firmware_class_init(void)
24 return class_register(&firmware_class);
27 -static void __exit firmware_class_exit(void)
28 +void __exit firmware_class_exit(void)
30 class_unregister(&firmware_class);
33 -fs_initcall(firmware_class_init);
34 -module_exit(firmware_class_exit);
36 EXPORT_SYMBOL_GPL(release_firmware);
37 EXPORT_SYMBOL_GPL(request_firmware);
38 EXPORT_SYMBOL_GPL(request_firmware_nowait);
41 @@ -47,6 +47,17 @@ void compat_dependency_symbol(void)
42 EXPORT_SYMBOL_GPL(compat_dependency_symbol);
45 +#if defined(CONFIG_FW_LOADER) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33))
46 +int __init firmware_class_init(void);
47 +void __exit firmware_class_exit(void);
49 +static inline int firmware_class_init(void)
53 +static inline void firmware_class_exit(void) {}
56 static int __init compat_init(void)
58 compat_pm_qos_power_init();
59 @@ -63,7 +74,8 @@ static int __init compat_init(void)
60 printk(KERN_INFO "compat.git: "
61 COMPAT_BASE_TREE "\n");
64 + firmware_class_init();
67 module_init(compat_init);
69 @@ -72,7 +84,8 @@ static void __exit compat_exit(void)
70 compat_pm_qos_power_deinit();
71 compat_system_workqueue_destroy();
74 + firmware_class_exit();
77 module_exit(compat_exit);