diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 12:01:28 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 12:01:28 -0500 |
| commit | 9db73724453a9350e1c22dbe732d427e2939a5c9 (patch) | |
| tree | 15e3ead6413ae97398a54292acc199bee0864d42 /drivers/char/tpm | |
| parent | 4c1ac1b49122b805adfa4efc620592f68dccf5db (diff) | |
| parent | e62438630ca37539c8cc1553710bbfaa3cf960a7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/ata/libata-scsi.c
include/linux/libata.h
Futher merge of Linus's head and compilation fixups.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'drivers/char/tpm')
| -rw-r--r-- | drivers/char/tpm/tpm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 050ced247f68..bb9a43c6cf3d 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/pci.h> | 22 | #include <linux/pci.h> |
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <linux/fs.h> | 24 | #include <linux/fs.h> |
| 25 | #include <linux/sched.h> | ||
| 25 | #include <linux/miscdevice.h> | 26 | #include <linux/miscdevice.h> |
| 26 | #include <linux/platform_device.h> | 27 | #include <linux/platform_device.h> |
| 27 | #include <linux/io.h> | 28 | #include <linux/io.h> |