summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-24 12:57:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-24 12:57:45 -0800
commit756fe285070feb254a770cefc5640fe005ea9c27 (patch)
treec391c039bc8ef7ec6958017413aba250210e9af6 /drivers/char
parenteec74a410fafd32c8f832d47dc196006ade68d05 (diff)
parented5a35acbb48d512332a53565e6341c65eecfa29 (diff)
downloadop-kernel-dev-756fe285070feb254a770cefc5640fe005ea9c27.zip
op-kernel-dev-756fe285070feb254a770cefc5640fe005ea9c27.tar.gz
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: VIDEO: cyberpro: pci_request_regions needs a persistent name ARM: dma-isa: request cascade channel after registering it ARM: footbridge: trim down old ISA rtc setup ARM: fix PAGE_KERNEL ARM: Fix wrong shared bit for CPU write buffer bug test ARM: 5857/1: ARM: dmabounce: fix build ARM: 5856/1: Fix bug of uart0 platfrom data for nuc900 ARM: 5855/1: putc support for nuc900 ARM: 5854/1: fix compiling error for NUC900 ARM: 5849/1: ARMv7: fix Oprofile events count ARM: add missing include to nwflash.c ARM: Kill CONFIG_CPU_32 ARM: Convert VFP/Crunch/XscaleCP thread_release() to exit_thread() ARM: 5853/1: ARM: Fix build break on ARM v6 and v7
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/nwflash.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/nwflash.c b/drivers/char/nwflash.c
index 8c7df5b..f808109 100644
--- a/drivers/char/nwflash.c
+++ b/drivers/char/nwflash.c
@@ -27,6 +27,7 @@
#include <linux/init.h>
#include <linux/smp_lock.h>
#include <linux/mutex.h>
+#include <linux/jiffies.h>
#include <asm/hardware/dec21285.h>
#include <asm/io.h>
OpenPOWER on IntegriCloud