diff options
| author | Kelly Daly <kelly@au.ibm.com> | 2005-11-02 15:10:38 +1100 |
|---|---|---|
| committer | Kelly Daly <kelly@au.ibm.com> | 2005-11-02 15:10:38 +1100 |
| commit | bbc8b628b07e191624a74ce99fe36681cd70af37 (patch) | |
| tree | d459c190aed494824f7c0dbf03a65a06b06da46d | |
| parent | 6cbbdabb0163471590bf0a57766e3ea5d920d26e (diff) | |
merge filename and modify references to iSeries/mf.h
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| -rw-r--r-- | arch/powerpc/platforms/iseries/mf.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/iseries/pci.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/iseries/setup.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/iseries/viopath.c | 2 | ||||
| -rw-r--r-- | drivers/net/iseries_veth.c | 2 | ||||
| -rw-r--r-- | include/asm-powerpc/iseries/mf.h (renamed from include/asm-ppc64/iSeries/mf.h) | 0 |
6 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c index 689f65a49c0..59916393dde 100644 --- a/arch/powerpc/platforms/iseries/mf.c +++ b/arch/powerpc/platforms/iseries/mf.c @@ -39,7 +39,7 @@ #include <asm/paca.h> #include <asm/abs_addr.h> #include <asm/iSeries/vio.h> -#include <asm/iSeries/mf.h> +#include <asm/iseries/mf.h> #include <asm/iseries/hv_lp_config.h> #include <asm/iseries/it_lp_queue.h> diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c index a39b7a72010..7d7d5884343 100644 --- a/arch/powerpc/platforms/iseries/pci.c +++ b/arch/powerpc/platforms/iseries/pci.c @@ -37,7 +37,7 @@ #include <asm/abs_addr.h> #include <asm/iseries/hv_call_xm.h> -#include <asm/iSeries/mf.h> +#include <asm/iseries/mf.h> #include <asm/ppc-pci.h> diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index 758f5b50628..d955e950a74 100644 --- a/arch/powerpc/platforms/iseries/setup.c +++ b/arch/powerpc/platforms/iseries/setup.c @@ -49,7 +49,7 @@ #include <asm/iseries/hv_call_event.h> #include <asm/iseries/hv_call_xm.h> #include <asm/iseries/it_lp_queue.h> -#include <asm/iSeries/mf.h> +#include <asm/iseries/mf.h> #include <asm/iseries/hv_lp_event.h> #include <asm/iseries/lpar_map.h> diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c index 6fa39ae5f12..72dfcb6d4dd 100644 --- a/arch/powerpc/platforms/iseries/viopath.c +++ b/arch/powerpc/platforms/iseries/viopath.c @@ -45,7 +45,7 @@ #include <asm/iseries/it_exp_vpd_panel.h> #include <asm/iseries/hv_lp_event.h> #include <asm/iseries/hv_lp_config.h> -#include <asm/iSeries/mf.h> +#include <asm/iseries/mf.h> #include <asm/iSeries/vio.h> /* Status of the path to each other partition in the system. diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c index 1070140d9f5..d86d8f055a6 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c @@ -72,7 +72,7 @@ #include <linux/ethtool.h> #include <asm/abs_addr.h> -#include <asm/iSeries/mf.h> +#include <asm/iseries/mf.h> #include <asm/uaccess.h> #include <asm/iseries/hv_lp_config.h> diff --git a/include/asm-ppc64/iSeries/mf.h b/include/asm-powerpc/iseries/mf.h index 166cd73f5c1..166cd73f5c1 100644 --- a/include/asm-ppc64/iSeries/mf.h +++ b/include/asm-powerpc/iseries/mf.h |