diff options
| author | Michal Simek <monstr@monstr.eu> | 2012-03-30 12:10:03 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2012-03-30 12:10:03 +0200 |
| commit | 6a4770e335bd4df0a4577146f76e116ab6e23f40 (patch) | |
| tree | 305056c20b6ccf3a4fed00e9e32f3a1dd039cd70 /arch/sparc/kernel/auxio_32.c | |
| parent | microblaze: Fix stack usage in PAGE_SIZE copy_tofrom_user (diff) | |
| parent | Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh (diff) | |
| download | linux-6a4770e335bd4df0a4577146f76e116ab6e23f40.tar.xz linux-6a4770e335bd4df0a4577146f76e116ab6e23f40.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'arch/sparc/kernel/auxio_32.c')
| -rw-r--r-- | arch/sparc/kernel/auxio_32.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/kernel/auxio_32.c b/arch/sparc/kernel/auxio_32.c index f7ea8f032719..56d0f52c3e62 100644 --- a/arch/sparc/kernel/auxio_32.c +++ b/arch/sparc/kernel/auxio_32.c @@ -13,6 +13,7 @@ #include <asm/io.h> #include <asm/auxio.h> #include <asm/string.h> /* memset(), Linux has no bzero() */ +#include <asm/cpu_type.h> /* Probe and map in the Auxiliary I/O register */ |