Revert "TPM: ACPI/PNP dependency removal"
authorJames Morris <jmorris@namei.org>
Thu, 6 May 2010 23:19:29 +0000 (09:19 +1000)
committerJames Morris <jmorris@namei.org>
Thu, 6 May 2010 23:19:29 +0000 (09:19 +1000)
commitec4a162af388a2716c5314c4aff7029071d09f57
tree10b5c972f756620c8bba693a4363029c42d37ef3
parentf70e2e06196ad4c1c762037da2f75354f6c16b81
Revert "TPM: ACPI/PNP dependency removal"

This reverts commit b89e66e1e396f7b5436af154e58209320cc08aed.

> > When CONFIG_PM is not set:
> >
> > drivers/built-in.o: In function `acpi_init':
> > bus.c:(.init.text+0x2d84): undefined reference to `pm_flags'
> > bus.c:(.init.text+0x2d91): undefined reference to `pm_flags'
>
> CONFIG_ACPI depends on CONFIG_PM,
> so acpi/bus.c should not be compiled for CONFIG_PM=n
>
> Hmm, is is somebody doing something strange, like "select ACPI"
> without guaranteeing that all of ACPI's dependencies are satisfied?

Signed-off-by: James Morris <jmorris@namei.org>
drivers/char/tpm/Kconfig
drivers/char/tpm/tpm_tis.c