summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-04 08:37:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-04 08:37:45 -0700
commitd7c764c4c7b782c660b4600b0bff2e3509892a4d (patch)
tree94e7540f4996e15f717001eb08e21dd59c42c0fd /drivers/media
parent148086bb64694cc91624bab2a550d50f800eb4b7 (diff)
parent818987e9a19c52240ba9b1c20f28f047eef76072 (diff)
downloadlinux-d7c764c4c7b782c660b4600b0bff2e3509892a4d.tar.gz
linux-d7c764c4c7b782c660b4600b0bff2e3509892a4d.tar.bz2
linux-d7c764c4c7b782c660b4600b0bff2e3509892a4d.zip
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, UV: Fix kdump reboot x86, amd-nb: Rename CPU PCI id define for F4 sound: Add delay.h to sound/soc/codecs/sn95031.c x86, mtrr, pat: Fix one cpu getting out of sync during resume x86, microcode: Unregister syscore_ops after microcode unloaded x86: Stop including <linux/delay.h> in two asm header files
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/rc/ite-cir.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
index ac0e42b47b2a..accaf6c9789a 100644
--- a/drivers/media/rc/ite-cir.c
+++ b/drivers/media/rc/ite-cir.c
@@ -41,6 +41,7 @@
#include <linux/bitops.h>
#include <media/rc-core.h>
#include <linux/pci_ids.h>
+#include <linux/delay.h>
#include "ite-cir.h"