Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=31c72ad0d10b561e7e5f843747e7d0c1abf4d6f7 Commit: 31c72ad0d10b561e7e5f843747e7d0c1abf4d6f7 Parent: 687d18abed09315a531470a0edcae977ef6a7f9e Author: Stephen Rothwell <[EMAIL PROTECTED]> AuthorDate: Fri Dec 15 15:44:04 2006 +1100 Committer: Paul Mackerras <[EMAIL PROTECTED]> CommitDate: Wed Dec 20 16:37:48 2006 +1100
[POWERPC] iSeries: fix viocd init Only initialise viocd on legacy iSeries. Signed-off-by: Stephen Rothwell <[EMAIL PROTECTED]> Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]> --- drivers/cdrom/viocd.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c index 54ca931..93fbf84 100644 --- a/drivers/cdrom/viocd.c +++ b/drivers/cdrom/viocd.c @@ -47,6 +47,7 @@ #include <asm/iseries/hv_types.h> #include <asm/iseries/hv_lp_event.h> #include <asm/iseries/vio.h> +#include <asm/firmware.h> #define VIOCD_DEVICE "iseries/vcd" @@ -748,6 +749,9 @@ static int __init viocd_init(void) struct proc_dir_entry *e; int ret = 0; + if (!firmware_has_feature(FW_FEATURE_ISERIES)) + return -ENODEV; + if (viopath_hostLp == HvLpIndexInvalid) { vio_set_hostlp(); /* If we don't have a host, bail out */ - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html