From: Cass May <c...@cassm.net>

3.12-stable review patch.  If anyone has any objections, please let me know.

===============

commit f11cc568758f23088c1f7a8369100c59e4c07bd6 upstream.

Avoid deprecated usage of EXTRA_CFLAGS by moving definition of DG_PART into 
dgnc_driver.h

Signed-off-by: Cass May <c...@cassm.net>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Signed-off-by: Jiri Slaby <jsl...@suse.cz>
---
 drivers/staging/dgnc/Makefile      | 2 --
 drivers/staging/dgnc/dgnc_driver.h | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/dgnc/Makefile b/drivers/staging/dgnc/Makefile
index 888c4334236b..9e1efcb8dcb7 100644
--- a/drivers/staging/dgnc/Makefile
+++ b/drivers/staging/dgnc/Makefile
@@ -1,5 +1,3 @@
-EXTRA_CFLAGS += -DDG_NAME=\"dgnc-1.3-16\" -DDG_PART=\"40002369_F\"
-
 obj-$(CONFIG_DGNC) += dgnc.o
 
 dgnc-objs :=   dgnc_cls.o dgnc_driver.o\
diff --git a/drivers/staging/dgnc/dgnc_driver.h 
b/drivers/staging/dgnc/dgnc_driver.h
index 218b15dccb7d..dca389ff992f 100644
--- a/drivers/staging/dgnc/dgnc_driver.h
+++ b/drivers/staging/dgnc/dgnc_driver.h
@@ -59,6 +59,8 @@
 #define        APR(args)       do { PRINTF_TO_KMEM(args); printk(DRVSTR": "); 
printk args; \
                           } while (0)
 #define        RAPR(args)      do { PRINTF_TO_KMEM(args); printk args; } while 
(0)
+#define        DG_NAME         "dgnc-1.3-16"
+#define        DG_PART         "40002369_F"            /* RPM part number      
 */
 
 #define TRC_TO_CONSOLE 1
 
-- 
2.4.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to