]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
Staging: vt6656: fix up built-in compilation together with rt2870
authorOtavio Salvador <otavio@ossystems.com.br>
Fri, 21 May 2010 22:08:14 +0000 (19:08 -0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Jun 2010 17:37:48 +0000 (10:37 -0700)
commitd500648ef675d9abfc02ffb96b09141bc9f76dba
tree0e7553070cb37fce8547716be41e9a4f5f76a674
parentd9d1ccb51f60cc211e0aa8d132bc3487053b2b1d
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>
drivers/staging/vt6656/aes_ccmp.c
drivers/staging/vt6656/tkip.c