diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-18 21:06:06 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-18 21:06:06 (GMT) |
| commit | 10667100a057af290ccfdf9c7178ba81867f80e7 (patch) | |
| tree | 9254e72155f7300047e146f7c8622320050a99cb /drivers | |
| parent | 2d0e63bea0f31e55de6a70bf6d00c597a5d8820b (diff) | |
| parent | 76192fa2b608ee7af61ab9dc865098a60c5d9973 (diff) | |
| download | linux-fsl-qoriq-10667100a057af290ccfdf9c7178ba81867f80e7.tar.xz | |
Merge remote-tracking branch 'origin/sdk-kernel-3.12' into sdk-v1.6.x
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/freescale/fman/inc/ncsw_ext.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/fman/inc/ncsw_ext.h b/drivers/net/ethernet/freescale/fman/inc/ncsw_ext.h index c3341cd..e7964ad 100644 --- a/drivers/net/ethernet/freescale/fman/inc/ncsw_ext.h +++ b/drivers/net/ethernet/freescale/fman/inc/ncsw_ext.h @@ -101,8 +101,9 @@ #define GIGABYTE ((uint64_t)(KILOBYTE * MEGABYTE)) /* 1024*1024*1024 */ #define TERABYTE ((uint64_t)(KILOBYTE * GIGABYTE)) /* 1024*1024*1024*1024 */ -#undef NO_IRQ -#define NO_IRQ (-1) +#ifndef NO_IRQ +#define NO_IRQ (0) +#endif #define NCSW_MASTER_ID (0) /* Macro for checking if a number is a power of 2 */ |