From a3bd8447be4ea2ce230eb8ae0e815c04d85fa15a Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Mon, 18 Mar 2013 15:12:18 +0100
Subject: udev: make firmware loading optional and disable by default

Distros that whish to support old kernels should set
  --with-firmware-dirs="/usr/lib/firmware/updates:/usr/lib/firmware"
to retain the old behaviour.
---
 src/udev/udev-builtin.c | 2 ++
 src/udev/udev.h         | 4 ++++
 2 files changed, 6 insertions(+)

(limited to 'src/udev')

diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
index 57d75a13e4..13922d3ce3 100644
--- a/src/udev/udev-builtin.c
+++ b/src/udev/udev-builtin.c
@@ -34,7 +34,9 @@ static const struct udev_builtin *builtins[] = {
         [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
 #endif
         [UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
+#ifdef ENABLE_FIRMWARE
         [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,
+#endif
         [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
         [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
 #ifdef HAVE_KMOD
diff --git a/src/udev/udev.h b/src/udev/udev.h
index b54cb58fc3..aa2edbef6e 100644
--- a/src/udev/udev.h
+++ b/src/udev/udev.h
@@ -140,7 +140,9 @@ enum udev_builtin_cmd {
         UDEV_BUILTIN_BLKID,
 #endif
         UDEV_BUILTIN_BTRFS,
+#ifdef ENABLE_FIRMWARE
         UDEV_BUILTIN_FIRMWARE,
+#endif
         UDEV_BUILTIN_HWDB,
         UDEV_BUILTIN_INPUT_ID,
 #ifdef HAVE_KMOD
@@ -167,7 +169,9 @@ struct udev_builtin {
 extern const struct udev_builtin udev_builtin_blkid;
 #endif
 extern const struct udev_builtin udev_builtin_btrfs;
+#ifdef ENABLE_FIRMWARE
 extern const struct udev_builtin udev_builtin_firmware;
+#endif
 extern const struct udev_builtin udev_builtin_hwdb;
 extern const struct udev_builtin udev_builtin_input_id;
 #ifdef HAVE_KMOD
-- 
cgit v1.2.3-54-g00ecf