From: Cass May Date: Sun, 15 Feb 2015 23:40:18 +0000 (+0000) Subject: dgnc: Move DG_PART definition from Makefile to dgnc_driver.h X-Git-Tag: v3.12.44~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c35200a686d3647b1ed44c2e803019b529a3ee2;p=thirdparty%2Fkernel%2Fstable.git 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 Signed-off-by: Greg Kroah-Hartman Signed-off-by: Jiri Slaby --- diff --git a/drivers/staging/dgnc/Makefile b/drivers/staging/dgnc/Makefile index 888c4334236b0..9e1efcb8dcb7f 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 218b15dccb7dc..dca389ff992fb 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