From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 21 May 2010 22:08:14 +0000 (-0300)
Subject: Staging: vt6656: fix up built-in compilation together with rt2870
X-Git-Tag: v2.6.36-rc1~520^2~1^2~454
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d500648ef675d9abfc02ffb96b09141bc9f76dba;p=pandora-kernel.git

Staging: vt6656: fix up built-in compilation together with rt2870

Fix this build error:

  drivers/staging/vt6656/built-in.o: In function `rotr1':
  (.text+0x1a878): multiple definition of `rotr1'
  drivers/staging/rt2870/built-in.o:(.text+0x106c2): first defined here
  drivers/staging/vt6656/built-in.o: In function `tkip_sbox':
  (.text+0x1a848): multiple definition of `tkip_sbox'
  drivers/staging/rt2870/built-in.o:(.text+0x10697): first defined here
  drivers/staging/vt6656/built-in.o: In function `xor_32':
  (.text+0x1ec24): multiple definition of `xor_32'
  drivers/staging/rt2870/built-in.o:(.text+0x111c4): first defined here
  drivers/staging/vt6656/built-in.o: In function `xor_128':
  (.text+0x1ec00): multiple definition of `xor_128'
  drivers/staging/rt2870/built-in.o:(.text+0x111dd): first defined here

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

Reading git-diff-tree failed