diff --git a/Makefile b/Makefile
index de65a17..abeafd7 100644
--- a/Makefile
+++ b/Makefile
@@ -277,7 +277,7 @@ LIBS += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
 endif
 LIBS += drivers/rtc/librtc.o
 LIBS += drivers/serial/libserial.o
-ifeq ($(CONFIG_GENERIC_LPC_TPM),y)
+ifeq ($(CONFIG_TPM),y)
 LIBS += drivers/tpm/libtpm.o
 endif
 LIBS += drivers/twserial/libtws.o
diff --git a/README b/README
index e9d1891..434384c 100644
--- a/README
+++ b/README
@@ -1073,7 +1073,10 @@ The following options need to be configured:
 			If this option is set, the driver enables cache flush.
 
 - TPM Support:
-		CONFIG_GENERIC_LPC_TPM
+		CONFIG_TPM
+		Support TPM devices.
+
+		CONFIG_TPM_TIS_LPC
 		Support for generic parallel port TPM devices. Only one device
 		per system is supported at this time.
 
diff --git a/drivers/tpm/Makefile b/drivers/tpm/Makefile
index be11c8b..47d09de 100644
--- a/drivers/tpm/Makefile
+++ b/drivers/tpm/Makefile
@@ -23,7 +23,7 @@ include $(TOPDIR)/config.mk
 
 LIB := $(obj)libtpm.o
 
-COBJS-$(CONFIG_GENERIC_LPC_TPM) = generic_lpc_tpm.o
+COBJS-$(CONFIG_TPM_TIS_LPC) = tpm_tis_lpc.o
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)