aboutsummaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/eject.c7
-rw-r--r--miscutils/hdparm.c3
2 files changed, 6 insertions, 4 deletions
diff --git a/miscutils/eject.c b/miscutils/eject.c
index 94a36c0da..75618bea6 100644
--- a/miscutils/eject.c
+++ b/miscutils/eject.c
@@ -13,7 +13,11 @@
13 * Most of the dirty work blatantly ripped off from cat.c =) 13 * Most of the dirty work blatantly ripped off from cat.c =)
14 */ 14 */
15 15
16#include <sys/mount.h>
16#include "libbb.h" 17#include "libbb.h"
18/* Must be after libbb.h: they need size_t */
19#include <scsi/sg.h>
20#include <scsi/scsi.h>
17 21
18/* various defines swiped from linux/cdrom.h */ 22/* various defines swiped from linux/cdrom.h */
19#define CDROMCLOSETRAY 0x5319 /* pendant of CDROMEJECT */ 23#define CDROMCLOSETRAY 0x5319 /* pendant of CDROMEJECT */
@@ -27,9 +31,6 @@
27/* Code taken from the original eject (http://eject.sourceforge.net/), 31/* Code taken from the original eject (http://eject.sourceforge.net/),
28 * refactored it a bit for busybox (ne-bb@nicoerfurth.de) */ 32 * refactored it a bit for busybox (ne-bb@nicoerfurth.de) */
29 33
30#include <scsi/sg.h>
31#include <scsi/scsi.h>
32
33static void eject_scsi(const char *dev) 34static void eject_scsi(const char *dev)
34{ 35{
35 static const char sg_commands[3][6] = { 36 static const char sg_commands[3][6] = {
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index e8a483830..362b212a3 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -11,8 +11,9 @@
11 * hdparm.c - Command line interface to get/set hard disk parameters 11 * hdparm.c - Command line interface to get/set hard disk parameters
12 * - by Mark Lord (C) 1994-2002 -- freely distributable 12 * - by Mark Lord (C) 1994-2002 -- freely distributable
13 */ 13 */
14#include "libbb.h"
15#include <linux/hdreg.h> 14#include <linux/hdreg.h>
15#include <sys/mount.h>
16#include "libbb.h"
16 17
17/* device types */ 18/* device types */
18/* ------------ */ 19/* ------------ */