diff options
| author | Michael Hennerich | 2009-10-09 09:37:03 +0200 |
|---|---|---|
| committer | Mike Frysinger | 2009-12-15 06:14:16 +0100 |
| commit | adfc046740b4161cbb1f0a3ea0d4200e21113489 (patch) | |
| tree | 943668244d2715915719d94164ec456d27a438b0 /arch/blackfin/mach-bf548 | |
| parent | Blackfin: push down asm/ includes and out of bfin-global.h (diff) | |
| download | kernel-qcow2-linux-adfc046740b4161cbb1f0a3ea0d4200e21113489.tar.gz kernel-qcow2-linux-adfc046740b4161cbb1f0a3ea0d4200e21113489.tar.xz kernel-qcow2-linux-adfc046740b4161cbb1f0a3ea0d4200e21113489.zip | |
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>
Diffstat (limited to 'arch/blackfin/mach-bf548')
| -rw-r--r-- | arch/blackfin/mach-bf548/boards/ezkit.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 |