From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Wed, 24 Feb 2010 19:31:04 +0000 (+0100)
Subject: Merge tag 'v2.6.33' for its firewire changes since last branch point
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~22925^2~15
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=109d28152b6e9d5de64cd23e3bc08885ccb3d1ef;p=mirror_ubuntu-artful-kernel.git

Merge tag 'v2.6.33' for its firewire changes since last branch point

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---

109d28152b6e9d5de64cd23e3bc08885ccb3d1ef
diff --cc drivers/firewire/core-cdev.c
index 5538d5130f7b,4eeaed57e219..3c1ac0933d24
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@@ -33,8 -32,10 +33,9 @@@
  #include <linux/module.h>
  #include <linux/mutex.h>
  #include <linux/poll.h>
 -#include <linux/preempt.h>
  #include <linux/sched.h>
  #include <linux/spinlock.h>
+ #include <linux/string.h>
  #include <linux/time.h>
  #include <linux/uaccess.h>
  #include <linux/vmalloc.h>