aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-02-25 03:36:00 +0000
committerlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-02-25 03:36:00 +0000
commitf00205b43697b870a199bce2b5a47b89913767ab (patch)
tree046db3d67b6b0de57e4ce14a4395e408d9f43cdc
parent7e2b232ef6a3bb4ef5c66874ada42e09266d795e (diff)
downloadbusybox-w32-f00205b43697b870a199bce2b5a47b89913767ab.tar.gz
busybox-w32-f00205b43697b870a199bce2b5a47b89913767ab.tar.bz2
busybox-w32-f00205b43697b870a199bce2b5a47b89913767ab.zip
Minor cleanup from Garrett Kajmowicz.
git-svn-id: svn://busybox.net/trunk/busybox@14266 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--util-linux/fdisk.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 33ad84702..a64515598 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -37,8 +37,6 @@
37 37
38#include "busybox.h" 38#include "busybox.h"
39 39
40#define MAKE_VERSION(p,q,r) (65536*(p) + 256*(q) + (r))
41
42#define DKTYPENAMES 40#define DKTYPENAMES
43 41
44#define BLKRRPART _IO(0x12,95) /* re-read partition table */ 42#define BLKRRPART _IO(0x12,95) /* re-read partition table */
@@ -3977,8 +3975,7 @@ create_doslabel(void)
3977static void 3975static void
3978get_sectorsize(void) 3976get_sectorsize(void)
3979{ 3977{
3980 if (!user_set_sector_size 3978 if (!user_set_sector_size) {
3981 && get_kernel_revision() >= MAKE_VERSION(2,3,3)) {
3982 int arg; 3979 int arg;
3983 if (ioctl(fd, BLKSSZGET, &arg) == 0) 3980 if (ioctl(fd, BLKSSZGET, &arg) == 0)
3984 sector_size = arg; 3981 sector_size = arg;