diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:36:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:36:55 -0400 |
| commit | f6477cc76c73833a56e97f1fafc36a7ca92927e5 (patch) | |
| tree | 9b4ca3d9fa63ea001d516834c8b2707094f3f711 /include/asm-x86/geode.h | |
| parent | fd2c17e1777d46cff14c25ea774a4d17459d188a (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/timers
Diffstat (limited to 'include/asm-x86/geode.h')
| -rw-r--r-- | include/asm-x86/geode.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86/geode.h b/include/asm-x86/geode.h index 6e6458853a36..bb06027fc83e 100644 --- a/include/asm-x86/geode.h +++ b/include/asm-x86/geode.h | |||
| @@ -112,8 +112,8 @@ extern int geode_get_dev_base(unsigned int dev); | |||
| 112 | #define VSA_VR_UNLOCK 0xFC53 /* unlock virtual register */ | 112 | #define VSA_VR_UNLOCK 0xFC53 /* unlock virtual register */ |
| 113 | #define VSA_VR_SIGNATURE 0x0003 | 113 | #define VSA_VR_SIGNATURE 0x0003 |
| 114 | #define VSA_VR_MEM_SIZE 0x0200 | 114 | #define VSA_VR_MEM_SIZE 0x0200 |
| 115 | #define VSA_SIG 0x4132 /* signature is ascii 'VSA2' */ | 115 | #define AMD_VSA_SIG 0x4132 /* signature is ascii 'VSA2' */ |
| 116 | 116 | #define GSW_VSA_SIG 0x534d /* General Software signature */ | |
| 117 | /* GPIO */ | 117 | /* GPIO */ |
| 118 | 118 | ||
| 119 | #define GPIO_OUTPUT_VAL 0x00 | 119 | #define GPIO_OUTPUT_VAL 0x00 |