From: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Date: Thu, 19 Jan 2012 20:00:53 +0000 (-0600)
Subject: [SCSI] hpsa: combine hpsa_scsi_detect and hpsa_register_scsi
X-Git-Tag: v3.4-rc1~145^2~158
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b705690d8d16f7081be3637c0bda2a681f02ecf4;p=pandora-kernel.git

[SCSI] hpsa: combine hpsa_scsi_detect and hpsa_register_scsi

hpsa_register_scsi just calls hpsa_scsi_detect.  Move
the guts of hpsa_scsi_detect into hpsa_register_scsi and
get rid of hpsa_scsi_detect.

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
---

Reading git-diff-tree failed