summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/sh/include/asm/gpio.h2
-rw-r--r--arch/sh/include/cpu-common/cpu/pfc.h4
-rw-r--r--arch/sh/kernel/cpu/pfc.c13
3 files changed, 2 insertions, 17 deletions
diff --git a/arch/sh/include/asm/gpio.h b/arch/sh/include/asm/gpio.h
index 04f53d3..7dfe15e 100644
--- a/arch/sh/include/asm/gpio.h
+++ b/arch/sh/include/asm/gpio.h
@@ -20,7 +20,7 @@
#endif
#define ARCH_NR_GPIOS 512
-#include <linux/sh_pfc.h>
+#include <asm-generic/gpio.h>
#ifdef CONFIG_GPIOLIB
diff --git a/arch/sh/include/cpu-common/cpu/pfc.h b/arch/sh/include/cpu-common/cpu/pfc.h
index 40e8643..e538813 100644
--- a/arch/sh/include/cpu-common/cpu/pfc.h
+++ b/arch/sh/include/cpu-common/cpu/pfc.h
@@ -18,13 +18,9 @@
#include <linux/types.h>
-struct pinmux_info;
struct resource;
int sh_pfc_register(const char *name,
struct resource *resource, u32 num_resources);
-int sh_pfc_register_info(const char *name,
- struct resource *resource, u32 num_resources,
- struct pinmux_info *pdata);
#endif /* __ARCH_SH_CPU_PFC_H__ */
diff --git a/arch/sh/kernel/cpu/pfc.c b/arch/sh/kernel/cpu/pfc.c
index d045d75..d766564 100644
--- a/arch/sh/kernel/cpu/pfc.c
+++ b/arch/sh/kernel/cpu/pfc.c
@@ -19,26 +19,15 @@
#include <cpu/pfc.h>
static struct platform_device sh_pfc_device = {
- .name = "sh-pfc",
.id = -1,
};
int __init sh_pfc_register(const char *name,
struct resource *resource, u32 num_resources)
{
- if (name)
- sh_pfc_device.name = name;
+ sh_pfc_device.name = name;
sh_pfc_device.num_resources = num_resources;
sh_pfc_device.resource = resource;
return platform_device_register(&sh_pfc_device);
}
-
-int __init sh_pfc_register_info(const char *name,
- struct resource *resource, u32 num_resources,
- struct pinmux_info *pdata)
-{
- sh_pfc_device.dev.platform_data = pdata;
-
- return sh_pfc_register(name, resource, num_resources);
-}