On Sat, May 30, 2015 at 10:17:30PM +0200, Frans Klaver wrote: > On Sat, May 30, 2015 at 05:38:21PM +0200, Mikko Rapeli wrote: > > Fixes compilation error: > > > > scsi/scsi_netlink_fc.h:60:2: error: expected specifier-qualifier-list > > before ‘uint64_t’ > > > > Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi> > > --- > > include/uapi/scsi/scsi_netlink_fc.h | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/include/uapi/scsi/scsi_netlink_fc.h > > b/include/uapi/scsi/scsi_netlink_fc.h > > index 2493a0f..b857e34 100644 > > --- a/include/uapi/scsi/scsi_netlink_fc.h > > +++ b/include/uapi/scsi/scsi_netlink_fc.h > > @@ -21,6 +21,11 @@ > > #ifndef SCSI_NETLINK_FC_H > > #define SCSI_NETLINK_FC_H > > > > +#ifdef __KERNEL__ > > +#include <linux/types.h> > > +#else > > +#include <stdint.h> > > +#endif > > #include <scsi/scsi_netlink.h> > > > > /* > > Shouldn't we be using __u64 and __u16 in this header instead?
Indeed, this was a rebase/merge botch. Thanks! -Mikko -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
