---

yaml
---
r: 273781
b: refs/heads/master
c: eb7c792
h: refs/heads/master
i:
  273779: e364ea6
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aeddea5d37d86d38c7a347110d8a052e9f45d955
+refs/heads/master: eb7c792da5afa3b9ec3e802c30952f82d2e9722b

trunk/arch/tile/include/asm/opcode_constants.h → trunk/arch/tile/include/arch/opcode.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Tilera Corporation. All Rights Reserved.
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
  *
  *   This program is free software; you can redistribute it and/or
  *   modify it under the terms of the GNU General Public License
@@ -12,15 +12,10 @@
  *   more details.
  */
 
-#ifndef _ASM_TILE_OPCODE_CONSTANTS_H
-#define _ASM_TILE_OPCODE_CONSTANTS_H
-
-#include <arch/chip.h>
-
-#if CHIP_WORD_SIZE() == 64
-#include <asm/opcode_constants_64.h>
+#if defined(__tilepro__)
+#include <arch/opcode_tilepro.h>
+#elif defined(__tilegx__)
+#include <arch/opcode_tilegx.h>
 #else
-#include <asm/opcode_constants_32.h>
+#error Unexpected Tilera chip type
 #endif
-
-#endif /* _ASM_TILE_OPCODE_CONSTANTS_H */