diff options
| author | LaMont Jones <lamont@debian.org> | 2011-01-31 20:15:49 -0700 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2011-01-31 20:15:49 -0700 |
| commit | 11292d25510e67c83c6580401eccd42d6d6da931 (patch) | |
| tree | ca5850da93c90f8798d7ff115e0124edffb8bb97 /shlibs/blkid/src/probe.c | |
| parent | 4f9e177060fb5ad6e574598aefdf2d5f50a8b54f (diff) | |
| parent | 9f55bf3794ca98852dd1f352f993dea60d83a2e1 (diff) | |
| download | util-linux-old-11292d25510e67c83c6580401eccd42d6d6da931.tar.gz | |
Merge remote branch 'origin/master'
Conflicts:
mount/mount.8
mount/mount.c
Diffstat (limited to 'shlibs/blkid/src/probe.c')
| -rw-r--r-- | shlibs/blkid/src/probe.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/shlibs/blkid/src/probe.c b/shlibs/blkid/src/probe.c index 0ef6f295..677b32fa 100644 --- a/shlibs/blkid/src/probe.c +++ b/shlibs/blkid/src/probe.c @@ -97,9 +97,6 @@ #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif -#ifdef HAVE_SYS_MKDEV_H -#include <sys/mkdev.h> -#endif #ifdef HAVE_ERRNO_H #include <errno.h> #endif @@ -115,7 +112,6 @@ # endif #endif -#include "blkdev.h" #include "blkidP.h" /* chains */ |