Merge branch 'master' from gregkh@master.kernel.org:/pub/scm/linux/hotplug/udev

[elogind.git] / extras / volume_id / volume_id / cramfs.c

diff --git a/extras/volume_id/volume_id/cramfs.c b/extras/volume_id/volume_id/cramfs.c
index 0c76860013dd64c62120143516bc051f68ddc523..85a1bc8c554e82fb3857f4389b365e49ef0e885d 100644 (file)
--- a/extras/volume_id/volume_id/cramfs.c
+++ b/extras/volume_id/volume_id/cramfs.c
@@ -3,19 +3,9 @@
  *
  * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
  *
- *     This library is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU Lesser General Public
- *     License as published by the Free Software Foundation; either
- *     version 2.1 of the License, or (at your option) any later version.
- *
- *     This library is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *     Lesser General Public License for more details.
- *
- *     You should have received a copy of the GNU Lesser General Public
- *     License along with this library; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *     This program is free software; you can redistribute it and/or modify it
+ *     under the terms of the GNU General Public License as published by the
+ *     Free Software Foundation version 2 of the License.
  */
 
 #ifndef _GNU_SOURCE
@@ -32,7 +22,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"
@@ -40,21 +29,21 @@
 #include "cramfs.h"
 
 struct cramfs_super {
-       __u8    magic[4];
-       __u32   size;
-       __u32   flags;
-       __u32   future;
-       __u8    signature[16];
+       uint8_t         magic[4];
+       uint32_t        size;
+       uint32_t        flags;
+       uint32_t        future;
+       uint8_t         signature[16];
        struct cramfs_info {
-               __u32   crc;
-               __u32   edition;
-               __u32   blocks;
-               __u32   files;
+               uint32_t        crc;
+               uint32_t        edition;
+               uint32_t        blocks;
+               uint32_t        files;
        } __attribute__((__packed__)) info;
-       __u8 name[16];
+       uint8_t         name[16];
 } __attribute__((__packed__));
 
-int volume_id_probe_cramfs(struct volume_id *id, __u64 off)
+int volume_id_probe_cramfs(struct volume_id *id, uint64_t off)
 {
        struct cramfs_super *cs;