diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 15:44:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 15:44:57 -0700 |
| commit | c3823c479e1f86a0adc7bb76fcfded67b042afc3 (patch) | |
| tree | 0f75e8ac7c126b81f09cf6453184ff20216d7c29 /drivers/char/keyboard.c | |
| parent | 5dfeaef89559d4968b0470adf749659f10d722f6 (diff) | |
| parent | ed3fa7c9510cde67d232299cab8052ff50a08285 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6: (25 commits)
avr32: Add hardware power-down function call
avr32: add include/asm-avr32/serial.h
avr32: don't offer PARPORT_PC
avr32: don't offer CONFIG_GEN_RTC
avr32: don't offer CONFIG_RTC
add include/asm-avr32/xor.h
avr32: Remove two unused #defines from mm/init.c
avr32: Implement set_rate(), set_parent() and mode() for pll1
avr32: Generic clockevents support
avr32: Move sleep code into mach-at32ap
avr32: Use constants from sysreg.h in asm.h
avr32: Delete mostly unused header asm/intc.h
avr32: start clocksource cleanup
avr32: pass i2c board info through at32_add_device_twi
avr32: cleanup - use _AC macro to define PAGE_SIZE
Generate raw keyboard codes for AVR32 architecture
atmel_usba_udc: Add support for AT91CAP9 UDPHS
atmel_usba_udc: Add missing kfree() in usba_udc_remove()
atmel_usba_udc: move endpoint declarations into platform data.
atmel_usba_udc: Kill GPIO_PIN_NONE
...
Diffstat (limited to 'drivers/char/keyboard.c')
| -rw-r--r-- | drivers/char/keyboard.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c index 4dbd3425e928..9769bf8279a6 100644 --- a/drivers/char/keyboard.c +++ b/drivers/char/keyboard.c @@ -1033,7 +1033,8 @@ DECLARE_TASKLET_DISABLED(keyboard_tasklet, kbd_bh, 0); #if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) ||\ defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC) ||\ defined(CONFIG_PARISC) || defined(CONFIG_SUPERH) ||\ - (defined(CONFIG_ARM) && defined(CONFIG_KEYBOARD_ATKBD) && !defined(CONFIG_ARCH_RPC)) + (defined(CONFIG_ARM) && defined(CONFIG_KEYBOARD_ATKBD) && !defined(CONFIG_ARCH_RPC)) ||\ + defined(CONFIG_AVR32) #define HW_RAW(dev) (test_bit(EV_MSC, dev->evbit) && test_bit(MSC_RAW, dev->mscbit) &&\ ((dev)->id.bustype == BUS_I8042) && ((dev)->id.vendor == 0x0001) && ((dev)->id.product == 0x0001)) |