Commit ec924975 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d1210929 61daf52c

arch/sparc/configs/sparc32_defconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,6 @@ CONFIG_INET6_ESP=m 
CONFIG_INET6_IPCOMP=m

CONFIG_INET6_IPCOMP=m

CONFIG_IPV6_TUNNEL=m

CONFIG_IPV6_TUNNEL=m

CONFIG_NET_PKTGEN=m

CONFIG_NET_PKTGEN=m

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM=y

arch/sparc/configs/sparc64_defconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,6 @@ CONFIG_IPV6_TUNNEL=m 
CONFIG_VLAN_8021Q=m

CONFIG_VLAN_8021Q=m

CONFIG_NET_PKTGEN=m

CONFIG_NET_PKTGEN=m

CONFIG_NET_TCPPROBE=m

CONFIG_NET_TCPPROBE=m

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

CONFIG_CONNECTOR=m

CONFIG_CONNECTOR=m

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_LOOP=m

arch/sparc/include/uapi/asm/openpromio.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -4,7 +4,6 @@ 




#include <linux/compiler.h>

#include <linux/compiler.h>

#include <linux/ioctl.h>

#include <linux/ioctl.h>

#include <linux/types.h>





/*

/*

 * SunOS and Solaris /dev/openprom definitions. The ioctl values

 * SunOS and Solaris /dev/openprom definitions. The ioctl values
@@ -13,7 +12,7 @@ 




struct openpromio

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. */

	char	oprom_array[1];		/* Holds property names and values. */

};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE