diff options
| author | Kay Sievers <kay@vrfy.org> | 2013-03-28 15:28:10 +0100 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2013-03-28 15:28:10 +0100 |
| commit | d8d4bee76cf3b40ea923bc57d44aa0815ca9b5ff (patch) | |
| tree | 5037a91a5accbf21b418489221f8ddb56f01354c /src | |
| parent | 0014c5221ec559e558968d9028cc6b7c07116252 (diff) | |
build-sys: fix HAVE/ENABLE_FIRMWARE
https://bugs.freedesktop.org/show_bug.cgi?id=62864
Diffstat (limited to 'src')
| -rw-r--r-- | src/udev/udev-builtin.c | 2 | ||||
| -rw-r--r-- | src/udev/udev.h | 4 | ||||
| -rw-r--r-- | src/udev/udevd.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c index 13922d3ce3..c7d431988d 100644 --- a/src/udev/udev-builtin.c +++ b/src/udev/udev-builtin.c @@ -34,7 +34,7 @@ static const struct udev_builtin *builtins[] = { [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid, #endif [UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs, -#ifdef ENABLE_FIRMWARE +#ifdef HAVE_FIRMWARE [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware, #endif [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb, diff --git a/src/udev/udev.h b/src/udev/udev.h index aa2edbef6e..906dfbaa0b 100644 --- a/src/udev/udev.h +++ b/src/udev/udev.h @@ -140,7 +140,7 @@ enum udev_builtin_cmd { UDEV_BUILTIN_BLKID, #endif UDEV_BUILTIN_BTRFS, -#ifdef ENABLE_FIRMWARE +#ifdef HAVE_FIRMWARE UDEV_BUILTIN_FIRMWARE, #endif UDEV_BUILTIN_HWDB, @@ -169,7 +169,7 @@ struct udev_builtin { extern const struct udev_builtin udev_builtin_blkid; #endif extern const struct udev_builtin udev_builtin_btrfs; -#ifdef ENABLE_FIRMWARE +#ifdef HAVE_FIRMWARE extern const struct udev_builtin udev_builtin_firmware; #endif extern const struct udev_builtin udev_builtin_hwdb; diff --git a/src/udev/udevd.c b/src/udev/udevd.c index b30bedfa5c..2ad73881d6 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -98,7 +98,7 @@ struct event { dev_t devnum; int ifindex; bool is_block; -#ifdef ENABLE_FIRMWARE +#ifdef HAVE_FIRMWARE bool nodelay; #endif }; @@ -444,7 +444,7 @@ static int event_queue_insert(struct udev_device *dev) event->devnum = udev_device_get_devnum(dev); event->is_block = streq("block", udev_device_get_subsystem(dev)); event->ifindex = udev_device_get_ifindex(dev); -#ifdef ENABLE_FIRMWARE +#ifdef HAVE_FIRMWARE if (streq(udev_device_get_subsystem(dev), "firmware")) event->nodelay = true; #endif @@ -527,7 +527,7 @@ static bool is_devpath_busy(struct event *event) return true; } -#ifdef ENABLE_FIRMWARE +#ifdef HAVE_FIRMWARE /* allow to bypass the dependency tracking */ if (event->nodelay) continue; |