Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d659f5e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Fix end-of-stack checking in save_stack_trace().
  sparc: don't use asm/of_device.h
  sparc64: Use kernel/uid16.c helpers instead of own copy.
  of/sparc: remove include of linux/of_platform.h from asm/of_platform.h
  sparc: i8042-sparcio.h: fix warning
parents 9da1f7e6 433c5f70

arch/sparc/include/asm/ebus_32.h

+1 −1
Original line number Diff line number Diff line
@@ -12,9 +12,9 @@ 
#ifndef _LINUX_IOPORT_H

#include <linux/ioport.h>

#endif

#include <linux/of_device.h>

#include <asm/oplib.h>

#include <asm/prom.h>

#include <asm/of_device.h>



struct linux_ebus_child {

	struct linux_ebus_child		*next;

arch/sparc/include/asm/ebus_64.h

+2 −1
Original line number Diff line number Diff line
@@ -8,9 +8,10 @@ 
#ifndef __SPARC64_EBUS_H

#define __SPARC64_EBUS_H



#include <linux/of_device.h>



#include <asm/oplib.h>

#include <asm/prom.h>

#include <asm/of_device.h>



struct linux_ebus_child {

	struct linux_ebus_child		*next;

arch/sparc/include/asm/of_platform.h

+0 −3
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ 
 *

 */



/* This is just here during the transition */

#include <linux/of_platform.h>



extern struct bus_type ebus_bus_type;

extern struct bus_type sbus_bus_type;

arch/sparc/include/asm/parport.h

+2 −1
Original line number Diff line number Diff line
@@ -6,9 +6,10 @@ 
#ifndef _ASM_SPARC64_PARPORT_H

#define _ASM_SPARC64_PARPORT_H 1



#include <linux/of_device.h>



#include <asm/ebus.h>

#include <asm/ns87303.h>

#include <asm/of_device.h>

#include <asm/prom.h>



#define PARPORT_PC_MAX_PORTS	PARPORT_MAX

arch/sparc/include/asm/sbus_32.h

+1 −1
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ 


#include <linux/dma-mapping.h>

#include <linux/ioport.h>

#include <linux/of_device.h>



#include <asm/oplib.h>

#include <asm/prom.h>

#include <asm/of_device.h>

#include <asm/scatterlist.h>



/* We scan which devices are on the SBus using the PROM node device