[kernel] r16400 - in dists/sid/linux-2.6/debian: . patches/bugfix/m68k patches/series

[Stephen Marenka]

Author: smarenka
Date: Wed Oct  6 00:36:03 2010
New Revision: 16400

Log:
m68k: add missing io macros

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/m68k/m68k_add_missing_io_macros.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/25

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Oct  4 01:07:53 2010	(r16399)
+++ dists/sid/linux-2.6/debian/changelog	Wed Oct  6 00:36:03 2010	(r16400)
@@ -5,6 +5,9 @@
   * Add stable 2.6.32.24 (trivial fix, already applied)
   * ipg: Remove device claimed by dl2k from pci id table (Closes: #599021)
 
+  [ Stephen R. Marenka ]
+  * m68k: fix missing io macros.
+
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 30 Sep 2010 12:28:58 +0100
 
 linux-2.6 (2.6.32-24) unstable; urgency=high

Added: dists/sid/linux-2.6/debian/patches/bugfix/m68k/m68k_add_missing_io_macros.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/m68k_add_missing_io_macros.patch	Wed Oct  6 00:36:03 2010	(r16400)
@@ -0,0 +1,37 @@
+On m68k, I/O macros like inb() outw() etc. are only defined to
+something useful if CONFIG_ISA is set; dummies are in place if
+not, but four macros were missing from the !CONFIG_ISA case.
+Adding these makes some drivers, such as speakup, compile again.
+The patch was made against Debian’s linux-2.6_2.6.32-24, but
+applies cleanly on linux-m68k master.
+
+Signed-off-by: Thorsten Glaser <tg at debian.org>
+---
+ arch/m68k/include/asm/io_mm.h |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h
+index 56a6555..be9d7da 100644
+--- a/arch/m68k/include/asm/io_mm.h
++++ b/arch/m68k/include/asm/io_mm.h
+@@ -387,9 +387,13 @@ static inline void isa_delay(void)
+ #define outb(val,port)     ((void)0)
+ #define outb_p(val,port)   ((void)0)
+ #define inw(port)          0xffff
++#define inw_p(port)        0xffff
+ #define outw(val,port)     ((void)0)
++#define outw_p(val,port)   ((void)0)
+ #define inl(port)          0xffffffffUL
++#define inl_p(port)        0xffffffffUL
+ #define outl(val,port)     ((void)0)
++#define outl_p(val,port)   ((void)0)
+ 
+ #define insb(port,buf,nr)  ((void)0)
+ #define outsb(port,buf,nr) ((void)0)
+-- 
+1.6.0.4
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
\ No newline at end of file

Modified: dists/sid/linux-2.6/debian/patches/series/25
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/25	Mon Oct  4 01:07:53 2010	(r16399)
+++ dists/sid/linux-2.6/debian/patches/series/25	Wed Oct  6 00:36:03 2010	(r16400)
@@ -2,3 +2,4 @@
 - bugfix/all/xen-Fix-typo-in-xen_percpu_chip-definition.patch
 + bugfix/all/stable/2.6.32.24.patch
 + bugfix/all/ipg-Remove-device-claimed-by-dl2k-from-pci-id-table.patch
++ bugfix/m68k/m68k_add_missing_io_macros.patch