diff options
| author | Bruce Evans <bde@FreeBSD.org> | 2000-11-04 15:03:34 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 2000-11-04 15:03:34 +0000 |
| commit | f18c4450ac639a3c09c578ab87febd1fb6a50a80 (patch) | |
| tree | d591e2f0b5fc0deb72b75ceac7a6ade1688f5cdd /sys/dev/en | |
| parent | 442ed3a3c4e2111705b926f0a50c228c15e440a0 (diff) | |
| download | src-f18c4450ac639a3c09c578ab87febd1fb6a50a80.tar.gz src-f18c4450ac639a3c09c578ab87febd1fb6a50a80.zip | |
Added used include of <machine/bus.h> -- don't depend on evil namespace
pollution in <sys/mutex.h>. This was half fixed in rev.1.3 of
midwayreg.h. The pollution exposed the bug that this driver was using
toy versions of the bus space macros under FreeBSD. Disabling the
toy versions made this driver compile but dependent on the pollution.
There was still a toy version of bus_space_read_1() in unreachable code.
Notes
Notes:
svn path=/head/; revision=68317
Diffstat (limited to 'sys/dev/en')
| -rw-r--r-- | sys/dev/en/if_en_pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c index 8a17e65c0f4e..e515fadcba04 100644 --- a/sys/dev/en/if_en_pci.c +++ b/sys/dev/en/if_en_pci.c @@ -56,6 +56,7 @@ #include <sys/malloc.h> #include <sys/socket.h> +#include <machine/bus.h> #include <net/if.h> @@ -321,7 +322,7 @@ en_pci_shutdown( #if !defined(MIDWAY_ENIONLY) -#if defined(sparc) || defined(__FreeBSD__) +#if defined(sparc) #define bus_space_read_1(t, h, o) \ ((void)t, (*(volatile u_int8_t *)((h) + (o)))) #endif |