diff options
| -rw-r--r-- | arch/powerpc/platforms/iseries/hvlpconfig.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/iseries/mf.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/iseries/setup.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/iseries/vio.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/iseries/viopath.c | 2 | ||||
| -rw-r--r-- | arch/ppc64/kernel/lparcfg.c | 2 | ||||
| -rw-r--r-- | drivers/block/viodasd.c | 2 | ||||
| -rw-r--r-- | drivers/char/viocons.c | 2 | ||||
| -rw-r--r-- | drivers/char/viotape.c | 2 | ||||
| -rw-r--r-- | drivers/net/iseries_veth.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/ibmvscsi/iseries_vscsi.c | 2 | ||||
| -rw-r--r-- | include/asm-powerpc/iseries/hv_lp_config.h (renamed from include/asm-ppc64/iSeries/HvLpConfig.h) | 0 |
12 files changed, 11 insertions, 11 deletions
diff --git a/arch/powerpc/platforms/iseries/hvlpconfig.c b/arch/powerpc/platforms/iseries/hvlpconfig.c index dc28621aea0d..663a1affb4bb 100644 --- a/arch/powerpc/platforms/iseries/hvlpconfig.c +++ b/arch/powerpc/platforms/iseries/hvlpconfig.c @@ -17,7 +17,7 @@ */ #include <linux/module.h> -#include <asm/iSeries/HvLpConfig.h> +#include <asm/iseries/hv_lp_config.h> HvLpIndex HvLpConfig_getLpIndex_outline(void) { diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c index e5de31aa0015..027df204446d 100644 --- a/arch/powerpc/platforms/iseries/mf.c +++ b/arch/powerpc/platforms/iseries/mf.c @@ -40,7 +40,7 @@ #include <asm/abs_addr.h> #include <asm/iSeries/vio.h> #include <asm/iSeries/mf.h> -#include <asm/iSeries/HvLpConfig.h> +#include <asm/iseries/hv_lp_config.h> #include <asm/iSeries/ItLpQueue.h> #include "setup.h" diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index 669e63174ecc..638747c772f8 100644 --- a/arch/powerpc/platforms/iseries/setup.c +++ b/arch/powerpc/platforms/iseries/setup.c @@ -45,7 +45,7 @@ #include <asm/cache.h> #include <asm/sections.h> #include <asm/abs_addr.h> -#include <asm/iSeries/HvLpConfig.h> +#include <asm/iseries/hv_lp_config.h> #include <asm/iseries/hv_call_event.h> #include <asm/iseries/hv_call_xm.h> #include <asm/iSeries/ItLpQueue.h> diff --git a/arch/powerpc/platforms/iseries/vio.c b/arch/powerpc/platforms/iseries/vio.c index c64741e50cb2..4e2dafc83bb2 100644 --- a/arch/powerpc/platforms/iseries/vio.c +++ b/arch/powerpc/platforms/iseries/vio.c @@ -19,7 +19,7 @@ #include <asm/page.h> #include <asm/iSeries/vio.h> #include <asm/iSeries/HvTypes.h> -#include <asm/iSeries/HvLpConfig.h> +#include <asm/iseries/hv_lp_config.h> #include <asm/iseries/hv_call_xm.h> struct device *iSeries_vio_dev = &vio_bus_device.dev; diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c index c0c767bd37f1..8e33a90bedb9 100644 --- a/arch/powerpc/platforms/iseries/viopath.c +++ b/arch/powerpc/platforms/iseries/viopath.c @@ -44,7 +44,7 @@ #include <asm/iSeries/HvTypes.h> #include <asm/iSeries/ItExtVpdPanel.h> #include <asm/iSeries/HvLpEvent.h> -#include <asm/iSeries/HvLpConfig.h> +#include <asm/iseries/hv_lp_config.h> #include <asm/iSeries/mf.h> #include <asm/iSeries/vio.h> diff --git a/arch/ppc64/kernel/lparcfg.c b/arch/ppc64/kernel/lparcfg.c index cae19bbd5acd..e4236f2707e1 100644 --- a/arch/ppc64/kernel/lparcfg.c +++ b/arch/ppc64/kernel/lparcfg.c @@ -26,7 +26,7 @@ #include <linux/init.h> #include <linux/seq_file.h> #include <asm/uaccess.h> -#include <asm/iSeries/HvLpConfig.h> +#include <asm/iseries/hv_lp_config.h> #include <asm/lppaca.h> #include <asm/hvcall.h> #include <asm/firmware.h> diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c index 709f809f79f1..5c907b747648 100644 --- a/drivers/block/viodasd.c +++ b/drivers/block/viodasd.c @@ -47,7 +47,7 @@ #include <asm/vio.h> #include <asm/iSeries/HvTypes.h> #include <asm/iSeries/HvLpEvent.h> -#include <asm/iSeries/HvLpConfig.h> +#include <asm/iseries/hv_lp_config.h> #include <asm/iSeries/vio.h> MODULE_DESCRIPTION("iSeries Virtual DASD"); diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c index ecf5c0953ae4..33d7820eaab9 100644 --- a/drivers/char/viocons.c +++ b/drivers/char/viocons.c @@ -48,7 +48,7 @@ #include <asm/iSeries/HvLpEvent.h> #include <asm/iseries/hv_call_event.h> -#include <asm/iSeries/HvLpConfig.h> +#include <asm/iseries/hv_lp_config.h> #include <asm/iseries/hv_call.h> #ifdef CONFIG_VT diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c index 232da8c5e66a..296797e5a2b5 100644 --- a/drivers/char/viotape.c +++ b/drivers/char/viotape.c @@ -57,7 +57,7 @@ #include <asm/iSeries/vio.h> #include <asm/iSeries/HvLpEvent.h> #include <asm/iseries/hv_call_event.h> -#include <asm/iSeries/HvLpConfig.h> +#include <asm/iseries/hv_lp_config.h> #define VIOTAPE_VERSION "1.2" #define VIOTAPE_MAXREQ 1 diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c index f5ea39ff1017..aaabaf30d4b8 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c @@ -75,7 +75,7 @@ #include <asm/iSeries/mf.h> #include <asm/uaccess.h> -#include <asm/iSeries/HvLpConfig.h> +#include <asm/iseries/hv_lp_config.h> #include <asm/iSeries/HvTypes.h> #include <asm/iSeries/HvLpEvent.h> #include <asm/iommu.h> diff --git a/drivers/scsi/ibmvscsi/iseries_vscsi.c b/drivers/scsi/ibmvscsi/iseries_vscsi.c index e9202f2a8276..c652779c1a32 100644 --- a/drivers/scsi/ibmvscsi/iseries_vscsi.c +++ b/drivers/scsi/ibmvscsi/iseries_vscsi.c @@ -31,7 +31,7 @@ #include <asm/iSeries/vio.h> #include <asm/iSeries/HvLpEvent.h> #include <asm/iSeries/HvTypes.h> -#include <asm/iSeries/HvLpConfig.h> +#include <asm/iseries/hv_lp_config.h> #include <asm/vio.h> #include <linux/device.h> #include "ibmvscsi.h" diff --git a/include/asm-ppc64/iSeries/HvLpConfig.h b/include/asm-powerpc/iseries/hv_lp_config.h index 9077fc8e3f6c..9077fc8e3f6c 100644 --- a/include/asm-ppc64/iSeries/HvLpConfig.h +++ b/include/asm-powerpc/iseries/hv_lp_config.h |