rapidio: add OF-tree support to RapidIO controller driver

PATCH In review [email protected] 1 participant 1 message Mar 28, 2008 PowerPC

lore

Share & tools

lore

[email protected]

author

2008-03-28 21:27 UTC #0 lore raw

PATCH 11/24 rapidio: add OF-tree support to RapidIO controller driver

From: Zhang Wei <[email protected]>

Signed-off-by Zhang Wei <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

---

 arch/powerpc/kernel/Makefile  |    1 
 arch/powerpc/kernel/rio.c     |   52 ---------------
 arch/powerpc/sysdev/fsl_rio.c |  110 +++++++++++++++++++++++++++++---
 arch/powerpc/sysdev/fsl_rio.h |   20 -----
 4 files changed, 102 insertions(+), 81 deletions(-)

arch/powerpc/kernel/Makefile renamed from arch/powerpc/kernel/Makefile~rapidio-add-of-tree-support-to-rapidio-controller-driver +0 -1

diff -puN arch/powerpc/kernel/Makefile~rapidio-add-of-tree-support-to-rapidio-controller-driver arch/powerpc/kernel/Makefile
@@ -72,7 +72,6 @@ pci64-$(CONFIG_PPC64)		+= pci_dn.o isa-b
 obj-$(CONFIG_PCI)		+= pci_$(CONFIG_WORD_SIZE).o $(pci64-y) \
 				   pci-common.o
 obj-$(CONFIG_PCI_MSI)		+= msi.o
-obj-$(CONFIG_RAPIDIO)		+= rio.o
 obj-$(CONFIG_KEXEC)		+= machine_kexec.o crash.o \
 				   machine_kexec_$(CONFIG_WORD_SIZE).o
 obj-$(CONFIG_AUDIT)		+= audit.o

arch/powerpc/kernel/rio.c deleted +0 ~~-52~~

52 lines not on this page · raw message

arch/powerpc/sysdev/fsl_rio.c renamed from arch/powerpc/sysdev/fsl_rio.c~rapidio-add-of-tree-support-to-rapidio-controller-driver +102 -8

157 lines not on this page · raw message

arch/powerpc/sysdev/fsl_rio.h deleted +0 ~~-20~~

diff -puN arch/powerpc/sysdev/fsl_rio.h~rapidio-add-of-tree-support-to-rapidio-controller-driver /dev/null
@@ -1,20 +0,0 @@
-/*
- * MPC85xx RapidIO definitions
- *
- * Copyright 2005 MontaVista Software, Inc.
- * Matt Porter <[email protected]>
- *
- * 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.
- */
-
-#ifndef __PPC_SYSLIB_PPC85XX_RIO_H
-#define __PPC_SYSLIB_PPC85XX_RIO_H
-
-#include <linux/init.h>
-
-extern void mpc85xx_rio_setup(int law_start, int law_size);
-
-#endif				/* __PPC_SYSLIB_PPC85XX_RIO_H */