diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 09:27:27 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 09:27:27 -0400 |
| commit | 38b22b6e9f46ab8f73ef5734f0e0a000766a9258 (patch) | |
| tree | 2ccc41ef55918d3af43e444bde7648562a031559 /arch/arm26/Kconfig | |
| parent | 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (diff) | |
| parent | b3e112bcc19abd8e9657dca34a87316786e096f3 (diff) | |
Automerge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/arm26/Kconfig')
| -rw-r--r-- | arch/arm26/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig index 6caed90661fc..dc0c1936969b 100644 --- a/arch/arm26/Kconfig +++ b/arch/arm26/Kconfig | |||
| @@ -179,6 +179,8 @@ config CMDLINE | |||
| 179 | time by entering them here. As a minimum, you should specify the | 179 | time by entering them here. As a minimum, you should specify the |
| 180 | memory size and the root device (e.g., mem=64M root=/dev/nfs). | 180 | memory size and the root device (e.g., mem=64M root=/dev/nfs). |
| 181 | 181 | ||
| 182 | source "mm/Kconfig" | ||
| 183 | |||
| 182 | endmenu | 184 | endmenu |
| 183 | 185 | ||
| 184 | source "drivers/base/Kconfig" | 186 | source "drivers/base/Kconfig" |