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

Commit 19fd3cab authored by Stephen Rothwell's avatar Stephen Rothwell Committed by David S. Miller
Browse files

sparc: merge of_platform_{32,64}.h 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 71fc324b

arch/sparc/include/asm/of_platform.h

+21 −5
Original line number Diff line number Diff line 
#ifndef ___ASM_SPARC_OF_PLATFORM_H

#define ___ASM_SPARC_OF_PLATFORM_H

#if defined(__sparc__) && defined(__arch64__)

#include <asm/of_platform_64.h>

#else

#include <asm/of_platform_32.h>

#endif

/*

 *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.

 *			 <benh@kernel.crashing.org>

 *    Modified for Sparc by merging parts of asm/of_device.h

 *		by Stephen Rothwell

 *

 *  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; either version

 *  2 of the License, or (at your option) any later version.

 *

 */



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



#define of_bus_type	of_platform_bus_type	/* for compatibility */



#endif

arch/sparc/include/asm/of_platform_32.h

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
#ifndef _ASM_SPARC_OF_PLATFORM_H

#define _ASM_SPARC_OF_PLATFORM_H

/*

 *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.

 *			 <benh@kernel.crashing.org>

 *    Modified for Sparc by merging parts of asm/of_device.h

 *		by Stephen Rothwell

 *

 *  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; either version

 *  2 of the License, or (at your option) any later version.

 *

 */



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



#define of_bus_type	of_platform_bus_type	/* for compatibility */



#endif	/* _ASM_SPARC_OF_PLATFORM_H */

arch/sparc/include/asm/of_platform_64.h

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
#ifndef _ASM_SPARC64_OF_PLATFORM_H

#define _ASM_SPARC64_OF_PLATFORM_H

/*

 *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.

 *			 <benh@kernel.crashing.org>

 *    Modified for Sparc by merging parts of asm/of_device.h

 *		by Stephen Rothwell

 *

 *  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; either version

 *  2 of the License, or (at your option) any later version.

 *

 */



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



#define of_bus_type	of_platform_bus_type	/* for compatibility */



#endif	/* _ASM_SPARC64_OF_PLATFORM_H */