diff options
author | Anton Blanchard <anton@samba.org> | 2009-10-20 16:06:21 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-23 22:33:03 -0500 |
commit | d95cacc599a79d87052b3975f60cae62c04dc01f (patch) | |
tree | c0a578296de8199a3dd486f5fed33198d99304ca | |
parent | b27df67248d3ae61d7814f18e363954254935090 (diff) |
powerpc: Move ehea hcall definitions into hvcall.h
Move ehea hcall definitions into hvcall.h.
Signed-off-by: Anton Blanchard <anton@samba.org>
Acked-by: Thomas Klein <tklein@de.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r-- | arch/powerpc/include/asm/hvcall.h | 13 | ||||
-rw-r--r-- | drivers/net/ehea/ehea_hcall.h | 51 | ||||
-rw-r--r-- | drivers/net/ehea/ehea_phyp.h | 1 |
3 files changed, 13 insertions, 52 deletions
diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h index 6251a4b10be7..3bf38af7c834 100644 --- a/arch/powerpc/include/asm/hvcall.h +++ b/arch/powerpc/include/asm/hvcall.h | |||
@@ -212,6 +212,19 @@ | |||
212 | #define H_QUERY_INT_STATE 0x1E4 | 212 | #define H_QUERY_INT_STATE 0x1E4 |
213 | #define H_POLL_PENDING 0x1D8 | 213 | #define H_POLL_PENDING 0x1D8 |
214 | #define H_ILLAN_ATTRIBUTES 0x244 | 214 | #define H_ILLAN_ATTRIBUTES 0x244 |
215 | #define H_MODIFY_HEA_QP 0x250 | ||
216 | #define H_QUERY_HEA_QP 0x254 | ||
217 | #define H_QUERY_HEA 0x258 | ||
218 | #define H_QUERY_HEA_PORT 0x25C | ||
219 | #define H_MODIFY_HEA_PORT 0x260 | ||
220 | #define H_REG_BCMC 0x264 | ||
221 | #define H_DEREG_BCMC 0x268 | ||
222 | #define H_REGISTER_HEA_RPAGES 0x26C | ||
223 | #define H_DISABLE_AND_GET_HEA 0x270 | ||
224 | #define H_GET_HEA_INFO 0x274 | ||
225 | #define H_ALLOC_HEA_RESOURCE 0x278 | ||
226 | #define H_ADD_CONN 0x284 | ||
227 | #define H_DEL_CONN 0x288 | ||
215 | #define H_JOIN 0x298 | 228 | #define H_JOIN 0x298 |
216 | #define H_VASI_STATE 0x2A4 | 229 | #define H_VASI_STATE 0x2A4 |
217 | #define H_ENABLE_CRQ 0x2B0 | 230 | #define H_ENABLE_CRQ 0x2B0 |
diff --git a/drivers/net/ehea/ehea_hcall.h b/drivers/net/ehea/ehea_hcall.h deleted file mode 100644 index 8e7d1c3edc60..000000000000 --- a/drivers/net/ehea/ehea_hcall.h +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | /* | ||
2 | * linux/drivers/net/ehea/ehea_hcall.h | ||
3 | * | ||
4 | * eHEA ethernet device driver for IBM eServer System p | ||
5 | * | ||
6 | * (C) Copyright IBM Corp. 2006 | ||
7 | * | ||
8 | * Authors: | ||
9 | * Christoph Raisch <raisch@de.ibm.com> | ||
10 | * Jan-Bernd Themann <themann@de.ibm.com> | ||
11 | * Thomas Klein <tklein@de.ibm.com> | ||
12 | * | ||
13 | * | ||
14 | * This program is free software; you can redistribute it and/or modify | ||
15 | * it under the terms of the GNU General Public License as published by | ||
16 | * the Free Software Foundation; either version 2, or (at your option) | ||
17 | * any later version. | ||
18 | * | ||
19 | * This program is distributed in the hope that it will be useful, | ||
20 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
21 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
22 | * GNU General Public License for more details. | ||
23 | * | ||
24 | * You should have received a copy of the GNU General Public License | ||
25 | * along with this program; if not, write to the Free Software | ||
26 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
27 | */ | ||
28 | |||
29 | #ifndef __EHEA_HCALL_H__ | ||
30 | #define __EHEA_HCALL_H__ | ||
31 | |||
32 | /** | ||
33 | * This file contains HCALL defines that are to be included in the appropriate | ||
34 | * kernel files later | ||
35 | */ | ||
36 | |||
37 | #define H_ALLOC_HEA_RESOURCE 0x278 | ||
38 | #define H_MODIFY_HEA_QP 0x250 | ||
39 | #define H_QUERY_HEA_QP 0x254 | ||
40 | #define H_QUERY_HEA 0x258 | ||
41 | #define H_QUERY_HEA_PORT 0x25C | ||
42 | #define H_MODIFY_HEA_PORT 0x260 | ||
43 | #define H_REG_BCMC 0x264 | ||
44 | #define H_DEREG_BCMC 0x268 | ||
45 | #define H_REGISTER_HEA_RPAGES 0x26C | ||
46 | #define H_DISABLE_AND_GET_HEA 0x270 | ||
47 | #define H_GET_HEA_INFO 0x274 | ||
48 | #define H_ADD_CONN 0x284 | ||
49 | #define H_DEL_CONN 0x288 | ||
50 | |||
51 | #endif /* __EHEA_HCALL_H__ */ | ||
diff --git a/drivers/net/ehea/ehea_phyp.h b/drivers/net/ehea/ehea_phyp.h index f3628c803567..2f8174c248bc 100644 --- a/drivers/net/ehea/ehea_phyp.h +++ b/drivers/net/ehea/ehea_phyp.h | |||
@@ -33,7 +33,6 @@ | |||
33 | #include <asm/hvcall.h> | 33 | #include <asm/hvcall.h> |
34 | #include "ehea.h" | 34 | #include "ehea.h" |
35 | #include "ehea_hw.h" | 35 | #include "ehea_hw.h" |
36 | #include "ehea_hcall.h" | ||
37 | 36 | ||
38 | /* Some abbreviations used here: | 37 | /* Some abbreviations used here: |
39 | * | 38 | * |