dgnc: Move DG_PART definition from Makefile to dgnc_driver.h

commit f11cc568758f23088c1f7a8369100c59e4c07bd6 upstream.

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

Signed-off-by: Cass May <cass@cassm.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>

diff --git a/drivers/staging/dgnc/Makefile b/drivers/staging/dgnc/Makefile
index 888c4334236b0ba09fd5e067322bf79b28a53fb3..9e1efcb8dcb7f8905939f5dd4974ecf20689f5e5 100644 (file)
--- 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 218b15dccb7dc970bef7bd1d56d491b51ad16884..dca389ff992fbc5fbebe1d30de80800e32d0902e 100644 (file)
--- 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