summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCass May <cass@cassm.net>2015-02-15 23:40:18 +0000
committerJiri Slaby <jslaby@suse.cz>2015-06-09 12:22:50 +0200
commit8c35200a686d3647b1ed44c2e803019b529a3ee2 (patch)
tree2f65be45148a560d6b487458d7cda9d123bf46f7
parentdba21826fae5822a8cc09e041d47f3adf96eab04 (diff)
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>
-rw-r--r--drivers/staging/dgnc/Makefile2
-rw-r--r--drivers/staging/dgnc/dgnc_driver.h2
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