]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
sparc: Merge asm-sparc{,64}/asi.h
authorSam Ravnborg <sam@ravnborg.org>
Fri, 13 Jun 2008 19:49:07 +0000 (21:49 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Jul 2008 04:42:30 +0000 (21:42 -0700)
commitbdc3135ac99efd59de084a309751ec76887e62d8
treea309fda7582c1935059da06390269ae4968a5974
parentb1a8bf92a0303301f3e013e2a2f45a4916453ce7
sparc: Merge asm-sparc{,64}/asi.h

Joined the two files as they contain distinct definitions.
Inspired by patch from: Adrian Bunk <bunk@kernel.org>

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Adrian Bunk <bunk@kernel.org>
include/asm-sparc/asi.h
include/asm-sparc64/asi.h