From: Andrew Morton <akpm@osdl.org>

Cc: Kylie Hall <kjhall@us.ibm.com>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/char/tpm/tpm.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

diff -puN drivers/char/tpm/tpm.c~tpm-use-clear_bit-fix-fix drivers/char/tpm/tpm.c
--- 25/drivers/char/tpm/tpm.c~tpm-use-clear_bit-fix-fix	Tue Apr 11 16:03:07 2006
+++ 25-akpm/drivers/char/tpm/tpm.c	Tue Apr 11 16:03:50 2006
@@ -47,8 +47,7 @@ enum tpm_duration {
 
 static LIST_HEAD(tpm_chip_list);
 static DEFINE_SPINLOCK(driver_lock);
-static unsigned long dev_mask[(TPM_NUM_DEVICES + BITS_PER_LONG - 1) /
-				BITS_PER_LONG];
+static DECLARE_BITMAP(dev_mask, TPM_NUM_DEVICES);
 
 /*
  * Array with one entry per ordinal defining the maximum amount
_