diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 11:37:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 11:37:45 -0400 |
| commit | d7c764c4c7b782c660b4600b0bff2e3509892a4d (patch) | |
| tree | 94e7540f4996e15f717001eb08e21dd59c42c0fd /drivers/media | |
| parent | 148086bb64694cc91624bab2a550d50f800eb4b7 (diff) | |
| parent | 818987e9a19c52240ba9b1c20f28f047eef76072 (diff) | |
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.c | 1 |
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 @@ | |||
| 41 | #include <linux/bitops.h> | 41 | #include <linux/bitops.h> |
| 42 | #include <media/rc-core.h> | 42 | #include <media/rc-core.h> |
| 43 | #include <linux/pci_ids.h> | 43 | #include <linux/pci_ids.h> |
| 44 | #include <linux/delay.h> | ||
| 44 | 45 | ||
| 45 | #include "ite-cir.h" | 46 | #include "ite-cir.h" |
| 46 | 47 | ||