From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 7 Aug 2008 08:55:03 +0000 (+0100)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
X-Git-Tag: v2.6.27-rc3~63^2~9
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4fb8af10d0fd09372d52966b76922b9e82bbc950;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
---

4fb8af10d0fd09372d52966b76922b9e82bbc950
diff --cc drivers/i2c/busses/i2c-s3c2410.c
index 598b9cbd3a0,4864723c742..b216bfbea78
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@@ -33,8 -33,9 +33,9 @@@
  #include <linux/err.h>
  #include <linux/platform_device.h>
  #include <linux/clk.h>
+ #include <linux/cpufreq.h>
  
 -#include <asm/hardware.h>
 +#include <asm/arch/hardware.h>
  #include <asm/irq.h>
  #include <asm/io.h>