From 20930e8c0bd28d9b214cdc7f969dae8330591957 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@argon.tklauser.home>
Date: Thu, 16 Aug 2007 14:06:53 +0200
Subject: Add patch to fix a typo in xcscope.el (Closes: #438170)

---
 debian/patches/00list                        |  1 +
 debian/patches/02-fix-xcscope-el-typo.dpatch | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100755 debian/patches/02-fix-xcscope-el-typo.dpatch

(limited to 'debian')

diff --git a/debian/patches/00list b/debian/patches/00list
index 759b17a..6e04a66 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +1,2 @@
 01-fix-resize-crash-inside-vim
+02-fix-xcscope-el-typo
diff --git a/debian/patches/02-fix-xcscope-el-typo.dpatch b/debian/patches/02-fix-xcscope-el-typo.dpatch
new file mode 100755
index 0000000..6ebe4df
--- /dev/null
+++ b/debian/patches/02-fix-xcscope-el-typo.dpatch
@@ -0,0 +1,17 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 02-fix-xcscope-el-typo.dpatch
+##
+## DP: Fixes a typo in contrib/xcscope/xcscope.el
+## DP: (Closes: #438170)
+
+--- cscope-15.6/contrib/xcscope/xcscope.el.orig	2007-08-16 13:38:28.000000000 +0200
++++ cscope-15.6/contrib/xcscope/xcscope.el	2007-08-16 13:38:38.000000000 +0200
+@@ -114,7 +114,7 @@
+ ;;	(define-key global-map [(control f11)] 'cscope-prev-symbol)
+ ;;	(define-key global-map [(control f12)] 'cscope-prev-file)
+ ;;      (define-key global-map [(meta f9)]  'cscope-display-buffer)
+-;;      (defin-ekey global-map [(meta f10)] 'cscope-display-buffer-toggle)
++;;      (define-key global-map [(meta f10)] 'cscope-display-buffer-toggle)
+ ;;
+ ;; 6. Restart (X)Emacs.  That's it.
+ ;;
-- 
cgit v1.2.3-54-g00ecf

d4ef231980181'>refs</a><a href='/cgit.cgi/linux/net-next.git/log/'>log</a><a href='/cgit.cgi/linux/net-next.git/tree/?id=19b5a91764fddcc51b2f8e54a81d4ef231980181'>tree</a><a class='active' href='/cgit.cgi/linux/net-next.git/commit/?id=19b5a91764fddcc51b2f8e54a81d4ef231980181'>commit</a><a href='/cgit.cgi/linux/net-next.git/diff/?id=19b5a91764fddcc51b2f8e54a81d4ef231980181'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/linux/net-next.git/log/'>
<input type='hidden' name='id' value='19b5a91764fddcc51b2f8e54a81d4ef231980181'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='19b5a91764fddcc51b2f8e54a81d4ef231980181'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Axel Lin &lt;axel.lin@ingics.com&gt;</td><td class='right'>2016-06-04 14:35:56 +0800</td></tr>
<tr><th>committer</th><td>Linus Walleij &lt;linus.walleij@linaro.org&gt;</td><td class='right'>2016-06-22 17:58:07 +0200</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/?id=19b5a91764fddcc51b2f8e54a81d4ef231980181'>19b5a91764fddcc51b2f8e54a81d4ef231980181</a> (<a href='/cgit.cgi/linux/net-next.git/patch/?id=19b5a91764fddcc51b2f8e54a81d4ef231980181'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/tree/?id=19b5a91764fddcc51b2f8e54a81d4ef231980181'>0ed08f122b2f3ce5b0816e3eb79f55cc7eac34af</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/?id=9ee8ff4867d07a6429991a0b748fa9c1586a7764'>9ee8ff4867d07a6429991a0b748fa9c1586a7764</a> (<a href='/cgit.cgi/linux/net-next.git/diff/?id=19b5a91764fddcc51b2f8e54a81d4ef231980181&amp;id2=9ee8ff4867d07a6429991a0b748fa9c1586a7764'>diff</a>)</td></tr></table>
<div class='commit-subject'>pinctrl: tegra: Fix build dependency</div><div class='commit-msg'>I got below build error:
ERROR: "tegra_xusb_padctl_legacy_probe"
 [drivers/phy/tegra/phy-tegra-xusb.ko] undefined!
with below build configuration:
CONFIG_ARCH_TEGRA=y
CONFIG_PINCTRL_TEGRA_XUSB=y
CONFIG_PHY_TEGRA_XUSB=y

The problem is below line in drivers/pinctrl/Makefile
obj-$(CONFIG_PINCTRL_TEGRA)     += tegra/

So even CONFIG_PINCTRL_TEGRA_XUSB=y is set, kbuild still does not compile
the code in drivers/pinctrl/tegra folder if !CONFIG_PINCTRL_TEGRA.

phy-tegra-xusb.c does not use any symbol from pinctrl-tegra.c,
so build pinctrl-tegra.c only when CONFIG_PINCTRL_TEGRA is set.

Signed-off-by: Axel Lin &lt;axel.lin@ingics.com&gt;
Acked-by: Jon Hunter &lt;jonathanh@nvidia.com&gt;
Signed-off-by: Linus Walleij &lt;linus.walleij@linaro.org&gt;
</div><div class='diffstat-header'><a href='/cgit.cgi/linux/net-next.git/diff/?id=19b5a91764fddcc51b2f8e54a81d4ef231980181'>Diffstat</a></div><table summary='diffstat' class='diffstat'>