merged commit between gingerbread and busybox/master 20110630
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index dbefa4c..4905f09 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -24,7 +24,13 @@
 
 #include "libbb.h"
 #include <mntent.h>
+#ifndef __BIONIC__
 #include <sys/swap.h>
+#endif
+
+#ifndef MNTTYPE_SWAP
+#define MNTTYPE_SWAP "swap"
+#endif
 
 #if ENABLE_FEATURE_MOUNT_LABEL
 # include "volume_id.h"