diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-07-13 22:09:23 (GMT) |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-07-13 22:09:23 (GMT) |
commit | c514720716c7b109ff980f8b3cb93f9af872c91c (patch) | |
tree | 490a9578995705de69712893a190b67651bddc56 /arch/m68k/Kconfig | |
parent | 07929dcb963786512c760dd3ecd148d89295e7e5 (diff) | |
parent | 1e279dd855d15b72364b4103f872d67d8592647e (diff) | |
download | linux-fsl-qoriq-c514720716c7b109ff980f8b3cb93f9af872c91c.tar.xz |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/m68k/Kconfig')
-rw-r--r-- | arch/m68k/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 691a246..178c4a3 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -450,6 +450,8 @@ source "drivers/zorro/Kconfig" endmenu +source "net/Kconfig" + source "drivers/Kconfig" menu "Character devices" |