Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965810AbbFJPqp (ORCPT ); Wed, 10 Jun 2015 11:46:45 -0400 Received: from ip4-83-240-67-251.cust.nbox.cz ([83.240.67.251]:36178 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933855AbbFJP1v (ORCPT ); Wed, 10 Jun 2015 11:27:51 -0400 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Cass May , Greg Kroah-Hartman , Jiri Slaby Subject: [PATCH 3.12 088/111] dgnc: Move DG_PART definition from Makefile to dgnc_driver.h Date: Wed, 10 Jun 2015 17:27:17 +0200 Message-Id: <8c35200a686d3647b1ed44c2e803019b529a3ee2.1433943052.git.jslaby@suse.cz> X-Mailer: git-send-email 2.4.2 In-Reply-To: <93091169a673f49c2574cddf1ef858cf0704f646.1433943052.git.jslaby@suse.cz> References: <93091169a673f49c2574cddf1ef858cf0704f646.1433943052.git.jslaby@suse.cz> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1683 Lines: 49 From: Cass May 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 Signed-off-by: Greg Kroah-Hartman Signed-off-by: Jiri Slaby --- 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 majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/