diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-13 10:09:41 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-13 10:09:41 -0700 |
| commit | b8724ae647c2c622f33f3a82d1b8632c887fa69b (patch) | |
| tree | 5e7c5f266d397f5688c55155cd5527d60ff9cd59 /shared-core/nouveau_reg.h | |
| parent | 2f03ba4aad1718a36168550b6a146b79540252e6 (diff) | |
| parent | 9a2adc442af9d83b85e4d558cb5e4d33597b60b9 (diff) | |
Merge branch 'modesetting-101' into modesetting-gem
Diffstat (limited to 'shared-core/nouveau_reg.h')
| -rw-r--r-- | shared-core/nouveau_reg.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/shared-core/nouveau_reg.h b/shared-core/nouveau_reg.h index 6ed23e26..091c22c4 100644 --- a/shared-core/nouveau_reg.h +++ b/shared-core/nouveau_reg.h @@ -128,8 +128,6 @@ #define NV04_PTIMER_TIME_1 0x00009410 #define NV04_PTIMER_ALARM_0 0x00009420 -#define NV50_I2C_CONTROLLER 0x0000E054 - #define NV04_PFB_CFG0 0x00100200 #define NV04_PFB_CFG1 0x00100204 #define NV40_PFB_020C 0x0010020C |