summaryrefslogtreecommitdiff
path: root/drm/nouveau/nvkm/subdev/bios/bit.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-01-14 14:40:03 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-01-19 15:42:00 +1000
commit528aac16321e74c6610d8c2a8c239f437763c5bb (patch)
treeba8eb6066460c78ae535f2af9b81639010cef1b6 /drm/nouveau/nvkm/subdev/bios/bit.c
parent820c287e9849391c4247114d40b78b6dcb67d571 (diff)
downloadnouveau-528aac16321e74c6610d8c2a8c239f437763c5bb.tar.gz
bios: 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 'drm/nouveau/nvkm/subdev/bios/bit.c')
-rw-r--r--drm/nouveau/nvkm/subdev/bios/bit.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drm/nouveau/nvkm/subdev/bios/bit.c b/drm/nouveau/nvkm/subdev/bios/bit.c
index 1d03a3f2b..eab540496 100644
--- a/drm/nouveau/nvkm/subdev/bios/bit.c
+++ b/drm/nouveau/nvkm/subdev/bios/bit.c
@@ -21,14 +21,11 @@
*
* Authors: Ben Skeggs
*/
-
-#include "core/object.h"
-
-#include "subdev/bios.h"
-#include "subdev/bios/bit.h"
+#include <subdev/bios.h>
+#include <subdev/bios/bit.h>
int
-bit_entry(struct nouveau_bios *bios, u8 id, struct bit_entry *bit)
+bit_entry(struct nvkm_bios *bios, u8 id, struct bit_entry *bit)
{
if (likely(bios->bit_offset)) {
u8 entries = nv_ro08(bios, bios->bit_offset + 10);