This patch fixes s390 dependency for x86
Signed-off-by: Jaswinder Singh <[email protected]>
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 1330061..b699ed5 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -537,4 +537,6 @@ source "security/Kconfig"
source "crypto/Kconfig"
+source "arch/s390/crypto/Kconfig"
+
source "lib/Kconfig"
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 5fd6688..5c2c7eb 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -48,8 +48,6 @@ config CRYPTO_DEV_PADLOCK_SHA
If unsure say M. The compiled module will be
called padlock-sha.ko
-source "arch/s390/crypto/Kconfig"
-
config CRYPTO_DEV_GEODE
tristate "Support for the Geode LX AES engine"
depends on X86_32 && PCI
diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
index 6972f26..529be08 100644
--- a/kernel/sysctl_check.c
+++ b/kernel/sysctl_check.c
@@ -1,6 +1,8 @@
#include <linux/stat.h>
#include <linux/sysctl.h>
+#ifdef CONFIG_S390
#include "../arch/s390/appldata/appldata.h"
+#endif
#include "../fs/xfs/linux-2.6/xfs_sysctl.h"
#include <linux/sunrpc/debug.h>
#include <linux/string.h>
On 11/30/07, Jaswinder Singh <[email protected]> wrote:
> 2.6.24-rc3 git kernel's x86 make depends on s390 arch:
>
> 1. HOSTLD scripts/kconfig/conf
> scripts/kconfig/conf -s arch/x86/Kconfig
> drivers/crypto/Kconfig:51: can't open file "arch/s390/crypto/Kconfig"
> make[2]: *** [silentoldconfig] Error 1
> make[1]: *** [silentoldconfig] Error 2
>
> 2. CC kernel/sysctl_check.o
> kernel/sysctl_check.c:3:44: error: ../arch/s390/appldata/appldata.h:
> No such file or directory
> make[1]: *** [kernel/sysctl_check.o] Error 1
> make: *** [kernel] Error 2
>
> Thank you,
>
> Jaswinder Singh.
>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]