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 remote-tracking branch 'agust/next' into merge
[pandora-kernel.git]
/
arch
/
arm
/
mach-footbridge
/
cats-hw.c
diff --git
a/arch/arm/mach-footbridge/cats-hw.c
b/arch/arm/mach-footbridge/cats-hw.c
index
a3da5d1
..
d5f1785
100644
(file)
--- a/
arch/arm/mach-footbridge/cats-hw.c
+++ b/
arch/arm/mach-footbridge/cats-hw.c
@@
-76,8
+76,7
@@
__initcall(cats_hw_init);
* hard reboots fail on early boards.
*/
static void __init
* hard reboots fail on early boards.
*/
static void __init
-fixup_cats(struct machine_desc *desc, struct tag *tags,
- char **cmdline, struct meminfo *mi)
+fixup_cats(struct tag *tags, char **cmdline, struct meminfo *mi)
{
screen_info.orig_video_lines = 25;
screen_info.orig_video_points = 16;
{
screen_info.orig_video_lines = 25;
screen_info.orig_video_points = 16;