[kernel] r14789 - in dists/trunk/linux-2.6/debian/patches: bugfix/all/stable series

[Dann Frazier]

Author: dannf
Date: Wed Dec 16 19:24:16 2009
New Revision: 14789

Log:
bugfix/arm/scsi-osd-build-fix.patch was also part of 2.6.32.1.
Revert it, then apply the full stable patch, as per convention.

Modified:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.1.patch
   dists/trunk/linux-2.6/debian/patches/series/2

Modified: dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.1.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.1.patch	Wed Dec 16 17:37:25 2009	(r14788)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.1.patch	Wed Dec 16 19:24:16 2009	(r14789)
@@ -1778,6 +1778,18 @@
  }
  
  static inline int sas_ss_flags(unsigned long sp)
+diff --git a/include/scsi/osd_protocol.h b/include/scsi/osd_protocol.h
+index 2cc8e8b..6856612 100644
+--- a/include/scsi/osd_protocol.h
++++ b/include/scsi/osd_protocol.h
+@@ -17,6 +17,7 @@
+ #define __OSD_PROTOCOL_H__
+ 
+ #include <linux/types.h>
++#include <linux/kernel.h>
+ #include <asm/unaligned.h>
+ #include <scsi/scsi.h>
+ 
 diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
 index 47941fc..0b4baba 100644
 --- a/include/scsi/scsi_host.h

Modified: dists/trunk/linux-2.6/debian/patches/series/2
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/2	Wed Dec 16 17:37:25 2009	(r14788)
+++ dists/trunk/linux-2.6/debian/patches/series/2	Wed Dec 16 19:24:16 2009	(r14789)
@@ -1,4 +1,5 @@
 + features/all/aufs2/aufs2-20091205.patch
 + bugfix/all/atl1c-use-common_task-instead-of-reset_task-and-link.patch
 + bugfix/all/netfilter-xtables-fix-conntrack-match-v1-ipt-save-output.patch
+- bugfix/arm/scsi-osd-build-fix.patch
 + bugfix/all/stable/2.6.32.1.patch