summaryrefslogtreecommitdiff
path: root/debian/patches/02-fix-xcscope-el-typo.dpatch
blob: 6ebe4df2b8f45ad02fff7f9f7c89ea06384430bc (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
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.
 ;;
t'>ARM: davinci: only use NVMEM when available
The davinci platform contains code that calls into the nvmem subsystem, but that might be a loadable module, causing a link error: arch/arm/mach-davinci/built-in.o: In function `davinci_get_mac_addr': :(.text+0x1088): undefined reference to `nvmem_device_read' arch/arm/mach-davinci/built-in.o: In function `read_factory_config': :(.text+0x214c): undefined reference to `nvmem_device_read' Also, when NVMEM is completely disabled, the functions fail with nonobvious error messages. This ensures we only call the API functions when the code is actually reachable from the board file, and otherwise prints a unique log message. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: bec3c11bad0e ("misc: at24: replace memory_accessor with nvmem_device_read") Signed-off-by: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Diffstat