From: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Date: Sun, 27 Jul 2008 11:54:08 +0000 (+0200)
Subject: Merge commit 'upstream/master'
X-Git-Tag: v2.6.27-rc1~56^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=eda3d8f5604860aae1bb9996bb5efc4213778369;p=linux-2.6-omap-h63xx.git

Merge commit 'upstream/master'
---

eda3d8f5604860aae1bb9996bb5efc4213778369
diff --cc drivers/mmc/host/atmel-mci.c
index c2f8aa840e8,b68381f7bfd..82bbbe99816
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@@ -9,8 -9,8 +9,9 @@@
   */
  #include <linux/blkdev.h>
  #include <linux/clk.h>
+ #include <linux/debugfs.h>
  #include <linux/device.h>
 +#include <linux/err.h>
  #include <linux/init.h>
  #include <linux/interrupt.h>
  #include <linux/ioport.h>