2 files changed, 4 insertions, 4 deletions
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index 6ffbefc44433..1c2ec2487195 100644
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -802,7 +802,7 @@ static struct platform_device bfin_device_gpiokeys = {
 };
 #endif
-#if defined(CONFIG_JOYSTICK_BFIN_ROTARY) || defined(CONFIG_JOYSTICK_BFIN_ROTARY_MODULE)
+#if defined(CONFIG_INPUT_BFIN_ROTARY) || defined(CONFIG_INPUT_BFIN_ROTARY_MODULE)
 #include <linux/input.h>
 #include <asm/bfin_rotary.h>
@@ -935,7 +935,7 @@ static struct platform_device *stamp_devices[] __initdata = {
        &bfin_device_gpiokeys,
 #endif
-#if defined(CONFIG_JOYSTICK_BFIN_ROTARY) || defined(CONFIG_JOYSTICK_BFIN_ROTARY_MODULE)
+#if defined(CONFIG_INPUT_BFIN_ROTARY) || defined(CONFIG_INPUT_BFIN_ROTARY_MODULE)
        &bfin_rotary_device,
 #endif
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c
index 1a5286bbb3fa..e926d3959051 100644
--- a/arch/blackfin/mach-bf548/boards/ezkit.c
+++ b/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -154,7 +154,7 @@ static struct platform_device bf54x_kpad_device = {
 };
 #endif
-#if defined(CONFIG_JOYSTICK_BFIN_ROTARY) || defined(CONFIG_JOYSTICK_BFIN_ROTARY_MODULE)
+#if defined(CONFIG_INPUT_BFIN_ROTARY) || defined(CONFIG_INPUT_BFIN_ROTARY_MODULE)
 #include <asm/bfin_rotary.h>
 static struct bfin_rotary_platform_data bfin_rotary_data = {
@@ -974,7 +974,7 @@ static struct platform_device *ezkit_devices[] __initdata = {
        &bf54x_kpad_device,
 #endif
-#if defined(CONFIG_JOYSTICK_BFIN_ROTARY) || defined(CONFIG_JOYSTICK_BFIN_ROTARY_MODULE)
+#if defined(CONFIG_INPUT_BFIN_ROTARY) || defined(CONFIG_INPUT_BFIN_ROTARY_MODULE)
        &bfin_rotary_device,
 #endif

diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index 6ffbefc44433..1c2ec2487195 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -802,7 +802,7 @@ static struct platform_device bfin_device_gpiokeys = {
802	};	802	};
803	#endif	803	#endif
804		804
805	#if defined(CONFIG_JOYSTICK_BFIN_ROTARY) \|\| defined(CONFIG_JOYSTICK_BFIN_ROTARY_MODULE)	805	#if defined(CONFIG_INPUT_BFIN_ROTARY) \|\| defined(CONFIG_INPUT_BFIN_ROTARY_MODULE)
806	#include <linux/input.h>	806	#include <linux/input.h>
807	#include <asm/bfin_rotary.h>	807	#include <asm/bfin_rotary.h>
808		808
@@ -935,7 +935,7 @@ static struct platform_device *stamp_devices[] __initdata = {
935	&bfin_device_gpiokeys,	935	&bfin_device_gpiokeys,
936	#endif	936	#endif
937		937
938	#if defined(CONFIG_JOYSTICK_BFIN_ROTARY) \|\| defined(CONFIG_JOYSTICK_BFIN_ROTARY_MODULE)	938	#if defined(CONFIG_INPUT_BFIN_ROTARY) \|\| defined(CONFIG_INPUT_BFIN_ROTARY_MODULE)
939	&bfin_rotary_device,	939	&bfin_rotary_device,
940	#endif	940	#endif
941		941


diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index 1a5286bbb3fa..e926d3959051 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -154,7 +154,7 @@ static struct platform_device bf54x_kpad_device = {
154	};	154	};
155	#endif	155	#endif
156		156
157	#if defined(CONFIG_JOYSTICK_BFIN_ROTARY) \|\| defined(CONFIG_JOYSTICK_BFIN_ROTARY_MODULE)	157	#if defined(CONFIG_INPUT_BFIN_ROTARY) \|\| defined(CONFIG_INPUT_BFIN_ROTARY_MODULE)
158	#include <asm/bfin_rotary.h>	158	#include <asm/bfin_rotary.h>
159		159
160	static struct bfin_rotary_platform_data bfin_rotary_data = {	160	static struct bfin_rotary_platform_data bfin_rotary_data = {
@@ -974,7 +974,7 @@ static struct platform_device *ezkit_devices[] __initdata = {
974	&bf54x_kpad_device,	974	&bf54x_kpad_device,
975	#endif	975	#endif
976		976
977	#if defined(CONFIG_JOYSTICK_BFIN_ROTARY) \|\| defined(CONFIG_JOYSTICK_BFIN_ROTARY_MODULE)	977	#if defined(CONFIG_INPUT_BFIN_ROTARY) \|\| defined(CONFIG_INPUT_BFIN_ROTARY_MODULE)
978	&bfin_rotary_device,	978	&bfin_rotary_device,
979	#endif	979	#endif
980		980