diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-08-08 16:21:02 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-08-08 16:21:02 -0400 |
commit | e4ddcb0a6bf04d53ce77b4eb87bbbb32c4261d11 (patch) | |
tree | d27d2fea50a384d97aa2d0cf5c8657c916f761d4 /arch/m68knommu/kernel/setup.c | |
parent | f2afa7711f8585ffc088ba538b9a510e0d5dca12 (diff) | |
parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
download | op-kernel-dev-e4ddcb0a6bf04d53ce77b4eb87bbbb32c4261d11.zip op-kernel-dev-e4ddcb0a6bf04d53ce77b4eb87bbbb32c4261d11.tar.gz |
Merge commit 'v2.6.27-rc1' into for-linus
Diffstat (limited to 'arch/m68knommu/kernel/setup.c')
-rw-r--r-- | arch/m68knommu/kernel/setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68knommu/kernel/setup.c b/arch/m68knommu/kernel/setup.c index 03f4fe6..5985f19 100644 --- a/arch/m68knommu/kernel/setup.c +++ b/arch/m68knommu/kernel/setup.c @@ -22,6 +22,7 @@ #include <linux/interrupt.h> #include <linux/fb.h> #include <linux/module.h> +#include <linux/mm.h> #include <linux/console.h> #include <linux/errno.h> #include <linux/string.h> |