From: Luis R. Rodriguez <mcgrof@frijolero.org>
Date: Sat, 25 Feb 2012 02:48:49 +0000 (-0800)
Subject: compat: fix compilation warning for compat_firmware_class on 2.6.26
X-Git-Tag: compat-2012-07-02~1^2~74
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=796f3eb54986853a9f67f3a7d2702a024f3f35e4;p=~emulex%2Ffor-vlad%2Fcompat.git

compat: fix compilation warning for compat_firmware_class on 2.6.26

This fixes this compilation issue:

  CC [M]  /home/mcgrof/compat/compat/compat_firmware_class.o
/home/mcgrof/compat/compat/compat_firmware_class.c:24:0: warning: "to_dev" redefined
include/linux/input.h:1218:0: note: this is the location of the previous definition
/home/mcgrof/compat/compat/compat_firmware_class.c:24:0: warning: "to_dev" redefined
include/linux/input.h:1218:0: note: this is the location of the previous definition

Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
---

diff --git a/compat/compat_firmware_class.c b/compat/compat_firmware_class.c
index 4eb5ba7..b085677 100644
--- a/compat/compat_firmware_class.c
+++ b/compat/compat_firmware_class.c
@@ -21,7 +21,10 @@
 #include <linux/firmware.h>
 #include <linux/slab.h>
 
+#ifdef to_dev
+#undef to_dev
 #define to_dev(obj) container_of(obj, struct device, kobj)
+#endif
 
 MODULE_AUTHOR("Manuel Estrada Sainz");
 MODULE_DESCRIPTION("Multi purpose firmware loading support");