From 59568e8f7c73fc44e48fbcbb04b714a1649339df Mon Sep 17 00:00:00 2001
From: Richard Weinberger <richard@nod.at>
Date: Mon, 10 Oct 2011 12:55:41 +0200
Subject: [PATCH] --- yaml --- r: 272309 b: refs/heads/master c:
 75b766258eb2b8255c628a994663bd5298f216e6 h: refs/heads/master i:   272307:
 b8bc85d035f95c4a0c97a269799e712069753f9d v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/crypto/Kconfig     | 1 +
 trunk/drivers/crypto/hifn_795x.c | 6 ++----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 42c6a934b3da..5c9c382e9f1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 906b2c9f2d9f395f5ca01b855b7c74b126517816
+refs/heads/master: 75b766258eb2b8255c628a994663bd5298f216e6
diff --git a/trunk/drivers/crypto/Kconfig b/trunk/drivers/crypto/Kconfig
index 4ac6d4d2bd14..6d16b4b0d7a0 100644
--- a/trunk/drivers/crypto/Kconfig
+++ b/trunk/drivers/crypto/Kconfig
@@ -200,6 +200,7 @@ config CRYPTO_DEV_HIFN_795X
 	select CRYPTO_BLKCIPHER
 	select HW_RANDOM if CRYPTO_DEV_HIFN_795X_RNG
 	depends on PCI
+	depends on !ARCH_DMA_ADDR_T_64BIT
 	help
 	  This option allows you to have support for HIFN 795x crypto adapters.
 
diff --git a/trunk/drivers/crypto/hifn_795x.c b/trunk/drivers/crypto/hifn_795x.c
index a84250a5dd51..fe765f49de58 100644
--- a/trunk/drivers/crypto/hifn_795x.c
+++ b/trunk/drivers/crypto/hifn_795x.c
@@ -2744,10 +2744,8 @@ static int __init hifn_init(void)
 	unsigned int freq;
 	int err;
 
-	if (sizeof(dma_addr_t) > 4) {
-		printk(KERN_INFO "HIFN supports only 32-bit addresses.\n");
-		return -EINVAL;
-	}
+	/* HIFN supports only 32-bit addresses */
+	BUILD_BUG_ON(sizeof(dma_addr_t) != 4);
 
 	if (strncmp(hifn_pll_ref, "ext", 3) &&
 	    strncmp(hifn_pll_ref, "pci", 3)) {