diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-28 15:34:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-28 15:34:01 -0400 |
| commit | 604a2785a8482cad4d63202465133c720db5eda7 (patch) | |
| tree | e2f510a8a54d7d4443cb52f3a0be46f527ebb779 /drivers/input/keyboard/bf54x-keys.c | |
| parent | 66833d5f3934a19d0988b7d0de58149bfd7a5884 (diff) | |
| parent | d310fb4bb73629840430cb13cb282915e49fef4b (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
Blackfin arch: Fix PM building on BF52x: No ROTWE on BF52x, add USBWE
Blackfin arch: sram: use 'unsigned long' for irqflags
Blackfin arch: let PCI depend on BROKEN
Blackfin arch: move include/asm-blackfin header files to arch/blackfin
Blackfin arch: fix bug - MPU crashes under stress
Blackfin arch: Fix bug - when to rmmod the L1_module, it stucks and then reboot the board.
Blackfin arch: dont actually need to muck with EMAC_SYSTAT for BF52x for demuxing
Blackfin arch: Add MTD Partitions for MTD_DATAFLASH, increase max SPI SCLK
Diffstat (limited to 'drivers/input/keyboard/bf54x-keys.c')
| -rw-r--r-- | drivers/input/keyboard/bf54x-keys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c index 6f227d3dbda1..e348cfccc17a 100644 --- a/drivers/input/keyboard/bf54x-keys.c +++ b/drivers/input/keyboard/bf54x-keys.c | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | #include <linux/input.h> | 43 | #include <linux/input.h> |
| 44 | 44 | ||
| 45 | #include <asm/portmux.h> | 45 | #include <asm/portmux.h> |
| 46 | #include <asm/mach/bf54x_keys.h> | 46 | #include <mach/bf54x_keys.h> |
| 47 | 47 | ||
| 48 | #define DRV_NAME "bf54x-keys" | 48 | #define DRV_NAME "bf54x-keys" |
| 49 | #define TIME_SCALE 100 /* 100 ns */ | 49 | #define TIME_SCALE 100 /* 100 ns */ |