diff options
author | Adrian Bunk <bunk@stusta.de> | 2005-12-23 00:03:47 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2005-12-23 02:09:54 -0500 |
commit | 0b57ee9e55373a27e45549e82b0c43621480a71b (patch) | |
tree | 03c584b93e9323d5057fdd482c6cb5c9a3e1d651 /drivers/char/keyboard.c | |
parent | 14904398e5b573d13f8c8dbd43a452ff34c0efc2 (diff) |
[SPARC]: introduce a SPARC Kconfig symbol
Introduce a Kconfig symbol SPARC that is defined on both the sparc and
sparc64 architectures.
This symbol makes some dependencies more readable.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/char/keyboard.c')
-rw-r--r-- | drivers/char/keyboard.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c index 449d029ad4f4..8b603b2d1c42 100644 --- a/drivers/char/keyboard.c +++ b/drivers/char/keyboard.c | |||
@@ -930,8 +930,8 @@ static void kbd_refresh_leds(struct input_handle *handle) | |||
930 | } | 930 | } |
931 | 931 | ||
932 | #if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) ||\ | 932 | #if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) ||\ |
933 | defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC32) ||\ | 933 | defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC) ||\ |
934 | defined(CONFIG_SPARC64) || defined(CONFIG_PARISC) || defined(CONFIG_SUPERH) ||\ | 934 | defined(CONFIG_PARISC) || defined(CONFIG_SUPERH) ||\ |
935 | (defined(CONFIG_ARM) && defined(CONFIG_KEYBOARD_ATKBD) && !defined(CONFIG_ARCH_RPC)) | 935 | (defined(CONFIG_ARM) && defined(CONFIG_KEYBOARD_ATKBD) && !defined(CONFIG_ARCH_RPC)) |
936 | 936 | ||
937 | #define HW_RAW(dev) (test_bit(EV_MSC, dev->evbit) && test_bit(MSC_RAW, dev->mscbit) &&\ | 937 | #define HW_RAW(dev) (test_bit(EV_MSC, dev->evbit) && test_bit(MSC_RAW, dev->mscbit) &&\ |
@@ -958,7 +958,7 @@ static unsigned short x86_keycodes[256] = | |||
958 | extern int mac_hid_mouse_emulate_buttons(int, int, int); | 958 | extern int mac_hid_mouse_emulate_buttons(int, int, int); |
959 | #endif /* CONFIG_MAC_EMUMOUSEBTN */ | 959 | #endif /* CONFIG_MAC_EMUMOUSEBTN */ |
960 | 960 | ||
961 | #if defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64) | 961 | #ifdef CONFIG_SPARC |
962 | static int sparc_l1_a_state = 0; | 962 | static int sparc_l1_a_state = 0; |
963 | extern void sun_do_break(void); | 963 | extern void sun_do_break(void); |
964 | #endif | 964 | #endif |
@@ -1045,7 +1045,7 @@ static void kbd_keycode(unsigned int keycode, int down, | |||
1045 | 1045 | ||
1046 | if (keycode == KEY_LEFTALT || keycode == KEY_RIGHTALT) | 1046 | if (keycode == KEY_LEFTALT || keycode == KEY_RIGHTALT) |
1047 | sysrq_alt = down; | 1047 | sysrq_alt = down; |
1048 | #if defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64) | 1048 | #ifdef CONFIG_SPARC |
1049 | if (keycode == KEY_STOP) | 1049 | if (keycode == KEY_STOP) |
1050 | sparc_l1_a_state = down; | 1050 | sparc_l1_a_state = down; |
1051 | #endif | 1051 | #endif |
@@ -1072,7 +1072,7 @@ static void kbd_keycode(unsigned int keycode, int down, | |||
1072 | return; | 1072 | return; |
1073 | } | 1073 | } |
1074 | #endif | 1074 | #endif |
1075 | #if defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64) | 1075 | #ifdef CONFIG_SPARC |
1076 | if (keycode == KEY_A && sparc_l1_a_state) { | 1076 | if (keycode == KEY_A && sparc_l1_a_state) { |
1077 | sparc_l1_a_state = 0; | 1077 | sparc_l1_a_state = 0; |
1078 | sun_do_break(); | 1078 | sun_do_break(); |