From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Aug 2008 17:53:43 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
X-Git-Tag: v2.6.27-rc2~111
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00e9028a95fb8a4d79f2fb695a853f33ea7d3b57;p=linux-2.6

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (28 commits)
  mm/hugetlb.c must #include <asm/io.h>
  video: Fix up hp6xx driver build regressions.
  sh: defconfig updates.
  sh: Kill off stray mach-rsk7203 reference.
  serial: sh-sci: Fix up SH7760/SH7780/SH7785 early printk regression.
  sh: Move out individual boards without mach groups.
  sh: Make sure AT_SYSINFO_EHDR is exposed to userspace in asm/auxvec.h.
  sh: Allow SH-3 and SH-5 to use common headers.
  sh: Provide common CPU headers, prune the SH-2 and SH-2A directories.
  sh/maple: clean maple bus code
  sh: More header path fixups for mach dir refactoring.
  sh: Move out the solution engine headers to arch/sh/include/mach-se/
  sh: I2C fix for AP325RXA and Migo-R
  sh: Shuffle the board directories in to mach groups.
  sh: dma-sh: Fix up dreamcast dma.h mach path.
  sh: Switch KBUILD_DEFCONFIG to shx3_defconfig.
  sh: Add ARCH_DEFCONFIG entries for sh and sh64.
  sh: Fix compile error of Solution Engine
  sh: Proper __put_user_asm() size mismatch fix.
  sh: Stub in a dummy ENTRY_OFFSET for uImage offset calculation.
  ...
---

00e9028a95fb8a4d79f2fb695a853f33ea7d3b57
diff --cc mm/hugetlb.c
index 254ce2b901,b3c78640b6..d237a02eb2
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@@ -17,10 -16,9 +17,10 @@@
  #include <linux/mutex.h>
  #include <linux/bootmem.h>
  #include <linux/sysfs.h>
- 
+ #include <asm/io.h>
  #include <asm/page.h>
  #include <asm/pgtable.h>
 +#include <asm/io.h>
  
  #include <linux/hugetlb.h>
  #include "internal.h"