diff --git a/[refs] b/[refs] index 57325d1231f4..e38893015931 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 906ef986a71d541a726550fa40dcbc5c356f810e +refs/heads/master: 94c96445f32c16cfdc398b20b7e78945ab7e35f9 diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h index a7dbfd857115..ebc22a836520 100644 --- a/trunk/include/linux/ide.h +++ b/trunk/include/linux/ide.h @@ -817,7 +817,6 @@ typedef struct hwif_s { unsigned extra_ports; /* number of extra dma ports */ unsigned present : 1; /* this interface exists */ - unsigned sg_mapped : 1; /* sg_table and sg_nents are ready */ unsigned busy : 1; /* serializes devices on a port */ struct device gendev;