]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Char: rio, fix cirrus defines
authorJiri Slaby <jirislaby@gmail.com>
Wed, 30 Apr 2008 07:53:57 +0000 (00:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Apr 2008 15:29:45 +0000 (08:29 -0700)
commitd6f6341a6475eb7f9c2b948a7d0fd56fd16ad675
treed43fe194f1d6d7af9ee30c78f7a763eb49fedfb7
parentcd989b3a8c30148c872c7677c7a0415584f1658c
Char: rio, fix cirrus defines

Rename defines to be in RIO* namespace to not to collide with other defines in
tree.  This broke (as akpm correctly pointed out) some allmodconfig builds,
e.g.  on ppc:

In file included from drivers/char/rio/rio_linux.c:81:
drivers/char/rio/cirrus.h:202:1: warning: "COMPLETE" redefined
In file included from include/net/netns/ipv4.h:8,
                 from include/net/net_namespace.h:13,
                 from include/linux/seq_file.h:7,
                 from include/asm/machdep.h:12,
                 from include/asm/pci.h:17,
                 from include/linux/pci.h:951,
                 from drivers/char/rio/rio_linux.c:50:
include/net/inet_frag.h:28:1: warning: this is the location of the previous definition

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/char/rio/cirrus.h
drivers/char/rio/rio_linux.c
drivers/char/rio/riocmd.c
drivers/char/rio/rioctrl.c
drivers/char/rio/riointr.c
drivers/char/rio/rioparam.c
drivers/char/rio/riotty.c