2013-10-21 05:20:00

by Michael Opdenacker

Subject: [PATCH] NTB: remove duplicate defines

Remove duplicate defines in drivers/ntb/ntb_regs.h

Signed-off-by: Michael Opdenacker <[email protected]>
---
drivers/ntb/ntb_regs.h | 3 ---
1 file changed, 3 deletions(-)

diff --git a/drivers/ntb/ntb_regs.h b/drivers/ntb/ntb_regs.h
index aa4bdd3..caa5975 100644
--- a/drivers/ntb/ntb_regs.h
+++ b/drivers/ntb/ntb_regs.h
@@ -75,9 +75,6 @@
#define SNB_SBAR2XLAT_OFFSET 0x0030
#define SNB_SBAR4XLAT_OFFSET 0x0038
#define SNB_SBAR0BASE_OFFSET 0x0040
-#define SNB_SBAR0BASE_OFFSET 0x0040
-#define SNB_SBAR2BASE_OFFSET 0x0048
-#define SNB_SBAR4BASE_OFFSET 0x0050
#define SNB_SBAR2BASE_OFFSET 0x0048
#define SNB_SBAR4BASE_OFFSET 0x0050
#define SNB_NTBCNTL_OFFSET 0x0058
--
1.8.1.2

2013-10-22 02:35:41

by Jon Mason

Subject: Re: [PATCH] NTB: remove duplicate defines

On Mon, Oct 21, 2013 at 07:19:42AM +0200, Michael Opdenacker wrote:
> Remove duplicate defines in drivers/ntb/ntb_regs.h
>
> Signed-off-by: Michael Opdenacker <[email protected]>

Applied to my next tree, which should go into 3.13.

Thanks,
Jon

> ---
> drivers/ntb/ntb_regs.h | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/drivers/ntb/ntb_regs.h b/drivers/ntb/ntb_regs.h
> index aa4bdd3..caa5975 100644
> --- a/drivers/ntb/ntb_regs.h
> +++ b/drivers/ntb/ntb_regs.h
> @@ -75,9 +75,6 @@
> #define SNB_SBAR2XLAT_OFFSET 0x0030
> #define SNB_SBAR4XLAT_OFFSET 0x0038
> #define SNB_SBAR0BASE_OFFSET 0x0040
> -#define SNB_SBAR0BASE_OFFSET 0x0040
> -#define SNB_SBAR2BASE_OFFSET 0x0048
> -#define SNB_SBAR4BASE_OFFSET 0x0050
> #define SNB_SBAR2BASE_OFFSET 0x0048
> #define SNB_SBAR4BASE_OFFSET 0x0050
> #define SNB_NTBCNTL_OFFSET 0x0058
> --
> 1.8.1.2
>