diff options
| author | Grant C. Likely <grant.likely@secretlab.ca> | 2006-01-19 01:12:32 -0700 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-07 22:35:35 +1100 |
| commit | b4367e7451f19a3ae8b453e8b7ac0a1fdd9bca04 (patch) | |
| tree | fb66222169af4015f89f7ab80fea0a1469eeeb50 /arch | |
| parent | 7d4d61544a12333600bdb9b018a149868418692e (diff) | |
[PATCH] powerpc: Move xparameters.h into xilinx virtex device specific path
xparameters should not be needed by anything but virtex platform code.
Move it from include/asm-ppc/ to platforms/4xx/xparameters/
This is preparing for work to remove xparameters from the dependancy tree
for most c files. xparam changes should not cause a recompile of the world.
Instead, drivers should get device info from the platform bus (populated
by the boot code)
Signed-off-by: Grant C. Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ppc/platforms/4xx/virtex-ii_pro.h | 2 | ||||
| -rw-r--r-- | arch/ppc/platforms/4xx/xparameters/xparameters.h | 18 | ||||
| -rw-r--r-- | arch/ppc/syslib/xilinx_pic.c | 2 |
3 files changed, 20 insertions, 2 deletions
diff --git a/arch/ppc/platforms/4xx/virtex-ii_pro.h b/arch/ppc/platforms/4xx/virtex-ii_pro.h index 9014c488733..026130c8e72 100644 --- a/arch/ppc/platforms/4xx/virtex-ii_pro.h +++ b/arch/ppc/platforms/4xx/virtex-ii_pro.h @@ -16,7 +16,7 @@ #define __ASM_VIRTEXIIPRO_H__ #include <linux/config.h> -#include <asm/xparameters.h> +#include <platforms/4xx/xparameters/xparameters.h> /* serial defines */ diff --git a/arch/ppc/platforms/4xx/xparameters/xparameters.h b/arch/ppc/platforms/4xx/xparameters/xparameters.h new file mode 100644 index 00000000000..fe4eac62913 --- /dev/null +++ b/arch/ppc/platforms/4xx/xparameters/xparameters.h @@ -0,0 +1,18 @@ +/* + * include/asm-ppc/xparameters.h + * + * This file includes the correct xparameters.h for the CONFIG'ed board + * + * Author: MontaVista Software, Inc. + * source@mvista.com + * + * 2004 (c) MontaVista Software, Inc. This file is licensed under the terms + * of the GNU General Public License version 2. This program is licensed + * "as is" without any warranty of any kind, whether express or implied. + */ + +#include <linux/config.h> + +#if defined(CONFIG_XILINX_ML300) +#include <platforms/4xx/xparameters/xparameters_ml300.h> +#endif diff --git a/arch/ppc/syslib/xilinx_pic.c b/arch/ppc/syslib/xilinx_pic.c index 47f04c71fe9..848fb512f3f 100644 --- a/arch/ppc/syslib/xilinx_pic.c +++ b/arch/ppc/syslib/xilinx_pic.c @@ -15,7 +15,7 @@ #include <linux/init.h> #include <linux/irq.h> #include <asm/io.h> -#include <asm/xparameters.h> +#include <platforms/4xx/xparameters/xparameters.h> #include <asm/ibm4xx.h> #include <asm/machdep.h> |