mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
Blackfin: update bfin_rotary defines
The driver was moved during the merge process, so update the defines to match the new location. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
parent
bbc51e97d3
commit
adfc046740
2 changed files with 4 additions and 4 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue