diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-12 19:50:10 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-12 19:50:10 -0400 |
| commit | ff299f1b1cb4e0c44a3f76d1f8ee4eb2f64f098f (patch) | |
| tree | 9e4d85cfc0c5a8394bc1fcafd7c406c5ac558c70 /arch/powerpc/include/asm/hvcall.h | |
| parent | 7d428ce284fce4aacb215ca15d0274e7261864a3 (diff) | |
| parent | ae7b6dccf6711e8d5815688f1572ab55bf5b3069 (diff) | |
Merge tag 's3c24xx-driver-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
From Kukjin Kim, driver updats for s3c24xx:
- move cpufreq driver into drivers/
- add pinctrl-s3c24xx driver
- cleanup OF in gpio driver
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/powerpc/include/asm/hvcall.h')
| -rw-r--r-- | arch/powerpc/include/asm/hvcall.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h index cf4df8e2139a..0c7f2bfcf134 100644 --- a/arch/powerpc/include/asm/hvcall.h +++ b/arch/powerpc/include/asm/hvcall.h | |||
| @@ -264,6 +264,7 @@ | |||
| 264 | #define H_GET_MPP 0x2D4 | 264 | #define H_GET_MPP 0x2D4 |
| 265 | #define H_HOME_NODE_ASSOCIATIVITY 0x2EC | 265 | #define H_HOME_NODE_ASSOCIATIVITY 0x2EC |
| 266 | #define H_BEST_ENERGY 0x2F4 | 266 | #define H_BEST_ENERGY 0x2F4 |
| 267 | #define H_XIRR_X 0x2FC | ||
| 267 | #define H_RANDOM 0x300 | 268 | #define H_RANDOM 0x300 |
| 268 | #define H_COP 0x304 | 269 | #define H_COP 0x304 |
| 269 | #define H_GET_MPP_X 0x314 | 270 | #define H_GET_MPP_X 0x314 |