diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2015-01-14 15:05:26 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-22 12:17:55 +1000 |
| commit | 78b2b4e76be2100637a92b9721aaa2ce73d0fa22 (patch) | |
| tree | 8d30155a84a7a57e055b9a0cb34833c42cfc4e23 /drivers/gpu/drm/nouveau/nvkm/subdev/i2c | |
| parent | drm/nouveau/ibus: namespace + nvidia gpu names (no binary change) (diff) | |
| download | linux-dev-78b2b4e76be2100637a92b9721aaa2ce73d0fa22.tar.xz linux-dev-78b2b4e76be2100637a92b9721aaa2ce73d0fa22.zip | |
drm/nouveau/instmem: namespace + nvidia gpu names (no binary change)
The namespace of NVKM is being changed to nvkm_ instead of nouveau_,
which will be used for the DRM part of the driver. This is being
done in order to make it very clear as to what part of the driver a
given symbol belongs to, and as a minor step towards splitting the
DRM driver out to be able to stand on its own (for virt).
Because there's already a large amount of churn here anyway, this is
as good a time as any to also switch to NVIDIA's device and chipset
naming to ease collaboration with them.
A comparison of objdump disassemblies proves no code changes.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/i2c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bit.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c index bfb0388f8d5b..9200f122c02c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c @@ -34,7 +34,7 @@ * interface to linux i2c bit-banging algorithm *****************************************************************************/ -#ifdef CONFIG_NVKM_I2C_INTERNAL_DEFAULT +#ifdef CONFIG_NOUVEAU_I2C_INTERNAL_DEFAULT #define CSTMSEL true #else #define CSTMSEL false diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bit.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bit.c index 35132badaa8f..861a453d2a67 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bit.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bit.c @@ -23,7 +23,7 @@ */ #include "priv.h" -#ifdef CONFIG_NVKM_I2C_INTERNAL +#ifdef CONFIG_NOUVEAU_I2C_INTERNAL #define T_TIMEOUT 2200000 #define T_RISEFALL 1000 #define T_HOLD 5000 |