diff options
| author | Linus Torvalds | 2019-07-14 01:04:19 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2019-07-14 01:04:19 +0200 |
| commit | ec9249752465b87b5b26d03f476eebaf872ebd12 (patch) | |
| tree | 4ec03e3a9e443654315f08be35e31eabfd6f39c0 /arch/sparc/include | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | sparc64: Add missing newline at end of file (diff) | |
| download | kernel-qcow2-linux-ec9249752465b87b5b26d03f476eebaf872ebd12.tar.gz kernel-qcow2-linux-ec9249752465b87b5b26d03f476eebaf872ebd12.tar.xz kernel-qcow2-linux-ec9249752465b87b5b26d03f476eebaf872ebd12.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc updates from David Miller:
"Just a few small changes:
- Fix console naming inconsistency with hypervisor consoles, from
John Paul Adrian Glaubitz
- Fix userland compilation due to use of u_int, from Masahiro Yamada"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Add missing newline at end of file
sparc: fix unknown type name u_int in uapi header
sparc: configs: Remove useless UEVENT_HELPER_PATH
sparc: Remove redundant copy of the LGPL-2.0
sunhv: Fix device naming inconsistency between sunhv_console and sunhv_reg
Diffstat (limited to 'arch/sparc/include')
| -rw-r--r-- | arch/sparc/include/uapi/asm/openpromio.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/include/uapi/asm/openpromio.h b/arch/sparc/include/uapi/asm/openpromio.h index 8817f7d1a70c..d4494b679e99 100644 --- a/arch/sparc/include/uapi/asm/openpromio.h +++ b/arch/sparc/include/uapi/asm/openpromio.h @@ -4,7 +4,6 @@ #include <linux/compiler.h> #include <linux/ioctl.h> -#include <linux/types.h> /* * SunOS and Solaris /dev/openprom definitions. The ioctl values @@ -13,7 +12,7 @@ struct openpromio { - u_int oprom_size; /* Actual size of the oprom_array. */ + unsigned int oprom_size; /* Actual size of the oprom_array. */ char oprom_array[1]; /* Holds property names and values. */ }; |