From: Kumar Gala <galak@kernel.crashing.org>
Date: Wed, 28 Jan 2009 06:07:20 +0000 (-0600)
Subject: dmi: Fix build breakage
X-Git-Tag: v2.6.29-rc3~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d8204ee2ad1c9babd7e33d4c118ec99a78a8442e;p=linux-2.6-omap-h63xx.git

dmi: Fix build breakage

Commit d7b1956fed33d30c4815e848fd7a143722916868 ("DMI: Introduce
dmi_first_match to make the interface more flexible") introduced compile
errors like the following when !CONFIG_DMI

    drivers/ata/sata_sil.c: In function 'sil_broken_system_poweroff':
    drivers/ata/sata_sil.c:713: error: implicit declaration of function 'dmi_first_match'
    drivers/ata/sata_sil.c:713: warning: initialization makes pointer from integer without a cast

We just need a dummy version of dmi_first_match() to fix this all up.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/linux/dmi.h b/include/linux/dmi.h
index aea23105d3e..d741b9ceb0e 100644
--- a/include/linux/dmi.h
+++ b/include/linux/dmi.h
@@ -65,6 +65,8 @@ static inline int dmi_walk(void (*decode)(const struct dmi_header *))
 	{ return -1; }
 static inline bool dmi_match(enum dmi_field f, const char *str)
 	{ return false; }
+static inline const struct dmi_system_id *
+	dmi_first_match(const struct dmi_system_id *list) { return NULL; }
 
 #endif