[PATCH 0/2] Fix cciss/hpsa build errors

[Alex Chiang <achiang@hp.com>]

I recently tried to build mmotm, and configured both hpsa and cciss
as built-ins. I encountered the following build error since they
both export device attrs with the same name:

	drivers/scsi/built-in.o: multiple definition of `dev_attr_lunid'
	drivers/block/built-in.o: first defined here

The cciss patch seems obviously correct to me and would be appropriate
for the next .32-rc. But it's not critical, so if Jens wants to hold off
until next merge window, I'm fine with that.

The hpsa patch applies against mmotm. I haven't peeked at James's tree
to see if he's carrying hpsa, but my guess is "probably not". In that
case, I'm hoping Andrew can carry it until hpsa gets merged.

Thanks,
/ac

---

Alex Chiang (2):
      cciss: make device attrs static
      hpsa: make device attrs static


 drivers/block/cciss.c |   16 ++++++++--------
 drivers/scsi/hpsa.c   |    8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)