git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
ia64
/
sn
/
kernel
/
setup.c
diff --git
a/arch/ia64/sn/kernel/setup.c
b/arch/ia64/sn/kernel/setup.c
index
dd6bcf4
..
5f2dcba
100644
(file)
--- a/
arch/ia64/sn/kernel/setup.c
+++ b/
arch/ia64/sn/kernel/setup.c
@@
-12,7
+12,7
@@
#include <linux/kernel.h>
#include <linux/kdev_t.h>
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/kdev_t.h>
#include <linux/string.h>
-#include <linux/
tty
.h>
+#include <linux/
screen_info
.h>
#include <linux/console.h>
#include <linux/timex.h>
#include <linux/sched.h>
#include <linux/console.h>
#include <linux/timex.h>
#include <linux/sched.h>
@@
-565,7
+565,7
@@
static void __init sn_init_pdas(char **cmdline_p)
* Also sets up a few fields in the nodepda. Also known as
* platform_cpu_init() by the ia64 machvec code.
*/
* Also sets up a few fields in the nodepda. Also known as
* platform_cpu_init() by the ia64 machvec code.
*/
-void __init sn_cpu_init(void)
+void __
cpu
init sn_cpu_init(void)
{
int cpuid;
int cpuphyid;
{
int cpuid;
int cpuphyid;