diff options
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/hpet.c | 7 | ||||
| -rw-r--r-- | drivers/char/tpm/tpm_acpi.c | 2 | ||||
| -rw-r--r-- | drivers/char/tpm/tpm_ppi.c | 1 |
3 files changed, 3 insertions, 7 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index 5d9c31dfc90..d5d4cd82b9f 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c @@ -34,15 +34,12 @@ #include <linux/uaccess.h> #include <linux/slab.h> #include <linux/io.h> - +#include <linux/acpi.h> +#include <linux/hpet.h> #include <asm/current.h> #include <asm/irq.h> #include <asm/div64.h> -#include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <linux/hpet.h> - /* * The High Precision Event Timer driver. * This driver is closely modelled after the rtc.c driver. diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c index 64420b3396a..b9a57fa4b71 100644 --- a/drivers/char/tpm/tpm_acpi.c +++ b/drivers/char/tpm/tpm_acpi.c @@ -23,7 +23,7 @@ #include <linux/security.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> #include "tpm.h" #include "tpm_eventlog.h" diff --git a/drivers/char/tpm/tpm_ppi.c b/drivers/char/tpm/tpm_ppi.c index e1f3337a0cf..70dbee4b50e 100644 --- a/drivers/char/tpm/tpm_ppi.c +++ b/drivers/char/tpm/tpm_ppi.c @@ -1,5 +1,4 @@ #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include "tpm.h" static const u8 tpm_ppi_uuid[] = { |