diff options
| author | Chen Gang <gang.chen@asianux.com> | 2013-09-21 20:38:30 +0800 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-06-09 12:12:32 +0200 |
| commit | d5b7aee1b3f1a0263b2c9266ecf08b5293e13139 (patch) | |
| tree | 1a93f57396a28698b1d51736ec907890ff639330 /drivers | |
| parent | bab6655ecb3ff43da784f5297ac04f5d991c1e23 (diff) | |
drivers: staging: dgap: move DG_NAME and DG_PART from "Makefile" to "dgap_driver.h"
commit 6319c61aecc7acaf39a1dc0e81a8aac6a17499ee upstream.
Normally, the macros from command line are system specific macros (e.g
__linux, __KERNEL__ ...), and module own macros are usually defined in
their header files.
DG_NAME and DG_PART are driver 'dgap' owned macros which are used by
multiple files within driver, and need be defined in the driver main
header file.
So move DG_NAME and DG_PART to "dgap_driver.h", it not only can make
code clearer, but also can avoid compiling failure when EXTRA_CFLAGS
appended to make command line (e.g. "EXTRA_CFLAGS=-W").
Signed-off-by: Chen Gang <gang.chen@asianux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/dgap/Makefile | 2 | ||||
| -rw-r--r-- | drivers/staging/dgap/dgap_driver.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/dgap/Makefile b/drivers/staging/dgap/Makefile index 9f1fce157c77..3abe8d2bb748 100644 --- a/drivers/staging/dgap/Makefile +++ b/drivers/staging/dgap/Makefile @@ -1,5 +1,3 @@ -EXTRA_CFLAGS += -DDG_NAME=\"dgap-1.3-16\" -DDG_PART=\"40002347_C\" - obj-$(CONFIG_DGAP) += dgap.o diff --git a/drivers/staging/dgap/dgap_driver.h b/drivers/staging/dgap/dgap_driver.h index b1cf489a729c..1742f4071e4d 100644 --- a/drivers/staging/dgap/dgap_driver.h +++ b/drivers/staging/dgap/dgap_driver.h @@ -53,6 +53,9 @@ * DPR((fmt, args, ...)); Only prints if DGAP_TRACER is defined at * compile time and dgap_debug!=0 */ +#define DG_NAME "dgap-1.3-16" +#define DG_PART "40002347_C" + #define PROCSTR "dgap" /* /proc entries */ #define DEVSTR "/dev/dg/dgap" /* /dev entries */ #define DRVSTR "dgap" /* Driver name string |