diff options
Diffstat (limited to 'documentation/dev-manual/dev-manual-common-tasks.xml')
| -rw-r--r-- | documentation/dev-manual/dev-manual-common-tasks.xml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml index 11ae3aa657..ce5cbf2528 100644 --- a/documentation/dev-manual/dev-manual-common-tasks.xml +++ b/documentation/dev-manual/dev-manual-common-tasks.xml | |||
| @@ -5826,8 +5826,7 @@ | |||
| 5826 | <para>The <filename>merge_config.sh</filename> script is | 5826 | <para>The <filename>merge_config.sh</filename> script is |
| 5827 | part of the Linux Yocto kernel Git repositories | 5827 | part of the Linux Yocto kernel Git repositories |
| 5828 | (i.e. <filename>linux-yocto-3.14</filename>, | 5828 | (i.e. <filename>linux-yocto-3.14</filename>, |
| 5829 | <filename>linux-yocto-3.10</filename>, | 5829 | <filename>linux-yocto-3.19</filename>, and so forth) |
| 5830 | <filename>linux-yocto-3.8</filename>, and so forth) | ||
| 5831 | in the | 5830 | in the |
| 5832 | <filename>scripts/kconfig</filename> directory.</para> | 5831 | <filename>scripts/kconfig</filename> directory.</para> |
| 5833 | <para>For more information on configuration fragments, | 5832 | <para>For more information on configuration fragments, |