From c5d3369f2730dcc683cf3133521bfe6a027ff1dc Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Fri, 9 Dec 2005 19:04:21 +0100 Subject: [PATCH] --- yaml --- r: 17191 b: refs/heads/master c: d52771fce4e774fa786097d34412a057d487c697 h: refs/heads/master i: 17189: 6f9e0b53e3da688b1385171f0b990ea9414dc345 17187: f8a514633cac984abb1c852abcc4ba3029ebd1a3 17183: 65ee37399d533d295b42442d81af0ae97b0bad16 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/cell/setup.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d436203db87a..4ff7c4819b15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49d65b3ac5614431041abcd2eabc0d77eff5e32d +refs/heads/master: d52771fce4e774fa786097d34412a057d487c697 diff --git a/trunk/arch/powerpc/platforms/cell/setup.c b/trunk/arch/powerpc/platforms/cell/setup.c index c41a6e2e2c30..e5ee42b67509 100644 --- a/trunk/arch/powerpc/platforms/cell/setup.c +++ b/trunk/arch/powerpc/platforms/cell/setup.c @@ -201,6 +201,15 @@ static int __init cell_probe(int platform) return 1; } +/* + * Cell has no legacy IO; anything calling this function has to + * fail or bad things will happen + */ +static int cell_check_legacy_ioport(unsigned int baseport) +{ + return -ENODEV; +} + struct machdep_calls __initdata cell_md = { .probe = cell_probe, .setup_arch = cell_setup_arch, @@ -213,6 +222,7 @@ struct machdep_calls __initdata cell_md = { .get_rtc_time = rtas_get_rtc_time, .set_rtc_time = rtas_set_rtc_time, .calibrate_decr = generic_calibrate_decr, + .check_legacy_ioport = cell_check_legacy_ioport, .progress = cell_progress, #ifdef CONFIG_KEXEC .machine_kexec = default_machine_kexec,