diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 07:17:26 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 07:17:26 -0400 |
| commit | f9b44121b34174ae4f243a568393fc3225842e75 (patch) | |
| tree | 943f68cd7458d08a9e8809ed0a10b71b23911f3e /scripts | |
| parent | 8727b909bb2348d29e62c599cd7a5d610da3760f (diff) | |
| parent | 220bf991b0366cc50a94feede3d7341fa5710ee4 (diff) | |
Merge commit 'v2.6.34-rc2' into for-2.6.34
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/gfp-translate | 2 | ||||
| -rwxr-xr-x | scripts/kernel-doc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/gfp-translate b/scripts/gfp-translate index 073cb6d152a0..d81b968d864e 100644 --- a/scripts/gfp-translate +++ b/scripts/gfp-translate | |||
| @@ -19,7 +19,7 @@ usage() { | |||
| 19 | exit 0 | 19 | exit 0 |
| 20 | } | 20 | } |
| 21 | 21 | ||
| 22 | # Parse command-line arguements | 22 | # Parse command-line arguments |
| 23 | while [ $# -gt 0 ]; do | 23 | while [ $# -gt 0 ]; do |
| 24 | case $1 in | 24 | case $1 in |
| 25 | --source) | 25 | --source) |
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 208ad3b0ca51..c7865c362d28 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc | |||
| @@ -2103,7 +2103,7 @@ sub process_file($) { | |||
| 2103 | $section = $newsection; | 2103 | $section = $newsection; |
| 2104 | } elsif (/$doc_end/) { | 2104 | } elsif (/$doc_end/) { |
| 2105 | 2105 | ||
| 2106 | if ($contents ne "") { | 2106 | if (($contents ne "") && ($contents ne "\n")) { |
| 2107 | dump_section($file, $section, xml_escape($contents)); | 2107 | dump_section($file, $section, xml_escape($contents)); |
| 2108 | $section = $section_default; | 2108 | $section = $section_default; |
| 2109 | $contents = ""; | 2109 | $contents = ""; |