aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pretzel.yyz.us>2005-06-26 23:42:30 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-26 23:42:30 -0400
commitf45727d52d1581e9ff4df9d1a12a60789ad2d1eb (patch)
tree773ae25f98542e6d382c688f7e85e8137d065614 /arch/cris
parent4c925f452cfd16c690209e96821ee094e09a2404 (diff)
parent5696c1944a33b4434a9a1ebb6383b906afd43a10 (diff)
Merge /spare/repo/netdev-2.6/ branch 'ieee80211'
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 4332ca348d51..f848e3761491 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -74,6 +74,8 @@ config PREEMPT
74 Say Y here if you are building a kernel for a desktop, embedded 74 Say Y here if you are building a kernel for a desktop, embedded
75 or real-time system. Say N if you are unsure. 75 or real-time system. Say N if you are unsure.
76 76
77source mm/Kconfig
78
77endmenu 79endmenu
78 80
79menu "Hardware setup" 81menu "Hardware setup"