linux-next: build warning in Linus' tree

[Stephen Rothwell]

Hi Linus,

After merging the hid tree, today's linux-next build (x86_64 allmodconfig)
produced this warning:

drivers/scsi/hpsa.c:94:1: warning: "PCI_DEVICE_ID_HP_CISSF" redefined
In file included from include/linux/pci.h:58,
                 from drivers/scsi/hpsa.c:25:
include/linux/pci_ids.h:746:1: warning: this is the location of the previous definition

Introduced by commit 6362beea8914cbd4630ccde3617d944aeca2d48f ("cciss:
fix PCI IDs for new Smart Array controllers") a commit that never made it
to linus-next :-(.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature