diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2011-05-15 23:00:11 +0100 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2011-07-01 16:41:10 -0400 |
| commit | a1bfb8769726d10f1f6274cdd4f5e7025bc5123e (patch) | |
| tree | 852272adc16b768f287ae22a9d24d5dfa75cb770 /usr/src | |
| parent | 3d01913950ba8a8e76927c6e2d48b02436872903 (diff) | |
| download | illumos-joyent-a1bfb8769726d10f1f6274cdd4f5e7025bc5123e.tar.gz | |
myri10ge: Remove use of deprecated preprocessor assertions
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/io/myri10ge/drv/myri10ge.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/usr/src/uts/common/io/myri10ge/drv/myri10ge.c b/usr/src/uts/common/io/myri10ge/drv/myri10ge.c index 7cdbad3249..791d6cb54c 100644 --- a/usr/src/uts/common/io/myri10ge/drv/myri10ge.c +++ b/usr/src/uts/common/io/myri10ge/drv/myri10ge.c @@ -52,8 +52,7 @@ static const char __idstring[] = static int myri10ge_small_bytes = 510; static int myri10ge_intr_coal_delay = 125; static int myri10ge_flow_control = 1; -#if #cpu(i386) || defined __i386 || defined i386 || \ - defined __i386__ || #cpu(x86_64) || defined __x86_64__ +#if defined __i386 || defined i386 || defined __i386__ || defined __x86_64__ static int myri10ge_nvidia_ecrc_enable = 1; #endif static int myri10ge_mtu_override = 0; @@ -4227,8 +4226,7 @@ myri10ge_slice_stat_init(struct myri10ge_slice_state *ss) -#if #cpu(i386) || defined __i386 || defined i386 || \ - defined __i386__ || #cpu(x86_64) || defined __x86_64__ +#if defined __i386 || defined i386 || defined __i386__ || defined __x86_64__ #include <vm/hat.h> #include <sys/ddi_isa.h> @@ -4672,8 +4670,7 @@ myri10ge_get_props(dev_info_t *dip) myri10ge_intr_coal_delay = ddi_prop_get_int(DDI_DEV_T_ANY, dip, 0, "myri10ge_intr_coal_delay", myri10ge_intr_coal_delay); -#if #cpu(i386) || defined __i386 || defined i386 || \ - defined __i386__ || #cpu(x86_64) || defined __x86_64__ +#if defined __i386 || defined i386 || defined __i386__ || defined __x86_64__ myri10ge_nvidia_ecrc_enable = ddi_prop_get_int(DDI_DEV_T_ANY, dip, 0, "myri10ge_nvidia_ecrc_enable", 1); #endif |