diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2012-01-17 15:22:12 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2012-01-17 15:22:12 +0000 |
| commit | 83d9870d974c7555387aed6902b78724e3df2dc1 (patch) | |
| tree | c551d1360728ecc81a54d8e5854940cf97051e6c /usr.sbin/sdio | |
| parent | af249de06a0b56728b89e3cebb80bdbe06c40313 (diff) | |
Avoid redefining DEVNAME from <dev/sdmmc/sdmmcvar.h> by renaming this one
to DEV_NAME. No functional change.
Diffstat (limited to 'usr.sbin/sdio')
| -rw-r--r-- | usr.sbin/sdio/sdio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/sdio/sdio.c b/usr.sbin/sdio/sdio.c index 0c5a3f5d8ea..7a8ebcdf74f 100644 --- a/usr.sbin/sdio/sdio.c +++ b/usr.sbin/sdio/sdio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sdio.c,v 1.5 2012/01/17 15:15:57 jsing Exp $ */ +/* $OpenBSD: sdio.c,v 1.6 2012/01/17 15:22:11 jsing Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> @@ -34,7 +34,7 @@ #include <dev/sdmmc/sdmmc_ioreg.h> #define DEV_BIO "/dev/bio" -#define DEVNAME "sdmmc0" +#define DEV_NAME "sdmmc0" struct sdio_hdl { int bio; @@ -70,7 +70,7 @@ sdio_open(const char *name, struct sdio_hdl **hdl) } bzero(&bl, sizeof bl); - bl.bl_name = DEVNAME; + bl.bl_name = DEV_NAME; if (ioctl((*hdl)->bio, BIOCLOCATE, &bl) == -1) { warn("unable to locate %s", bl.bl_name); @@ -233,7 +233,7 @@ main(int argc, char *argv[]) (dflag && argc != 1)) usage(); - if (sdio_open(DEVNAME, &hdl)) + if (sdio_open(DEV_NAME, &hdl)) return 1; if (dflag) { |