From 44ce1eb434f83a54fb0a69b56a46153ac75418a2 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Thu, 29 Apr 2010 13:04:35 -0700
Subject: [PATCH] Remove changes from linux-have-fm to prepare for topic branch
 removal.

---
 module/zfs/zfs_fm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/zfs/zfs_fm.c b/module/zfs/zfs_fm.c
index 9809aa5d03..8b7785fa83 100644
--- a/module/zfs/zfs_fm.c
+++ b/module/zfs/zfs_fm.c
@@ -92,7 +92,7 @@ void
 zfs_ereport_post(const char *subclass, spa_t *spa, vdev_t *vd, zio_t *zio,
     uint64_t stateoroffset, uint64_t size)
 {
-#if defined(_KERNEL) && defined(HAVE_FM)
+#ifdef _KERNEL
 	nvlist_t *ereport, *detector;
 	uint64_t ena;
 	char class[64];
@@ -334,7 +334,7 @@ zfs_ereport_post(const char *subclass, spa_t *spa, vdev_t *vd, zio_t *zio,
 static void
 zfs_post_common(spa_t *spa, vdev_t *vd, const char *name)
 {
-#if defined(_KERNEL) && defined(HAVE_FM)
+#ifdef _KERNEL
 	nvlist_t *resource;
 	char class[64];