Merge branch 'master' into upstream

This commit is contained in:
Jeff Garzik 2006-09-24 01:52:47 -04:00
commit 23930fa1ce
1430 changed files with 111297 additions and 35271 deletions

View file

@ -32,7 +32,6 @@
*
*/
#include <linux/config.h>
#include <linux/kernel.h>
#include <scsi/scsi.h>
#include <scsi/scsi_host.h>

View file

@ -268,7 +268,7 @@ static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start,
/* Match it to a port node */
index = (ap == ap->host->ports[0]) ? 0 : 1;
for (np = np->child; np != NULL; np = np->sibling) {
u32 *reg = (u32 *)get_property(np, "reg", NULL);
const u32 *reg = get_property(np, "reg", NULL);
if (!reg)
continue;
if (index == *reg)