UBUNTU: SAUCE: i915_bpo: Rename the backport driver to i915_bpo

BugLink: http://bugs.launchpad.net/bugs/1540390
Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/ubuntu/Kconfig b/ubuntu/Kconfig
index 34db6e15cec13390af8aebdbb053025da178167f..672a257c0021965ace7357613c824efc1be95174 100644 (file)
--- a/ubuntu/Kconfig
+++ b/ubuntu/Kconfig
@@ -14,5 +14,12 @@ source "ubuntu/dm-raid4-5/Kconfig"
 ##
 ##
 ##
+source "ubuntu/i915/Kconfig"
+##
+##
+##
+##
+##
+##
 
 endmenu

diff --git a/ubuntu/Makefile b/ubuntu/Makefile
index 174e53f729278e61a62445431e608c1b68407e49..20decaf70c974c27c7e0075a10cfa5b6a135da52 100644 (file)
--- a/ubuntu/Makefile
+++ b/ubuntu/Makefile
@@ -22,6 +22,13 @@ endif
 ##
 ##
 ##
+obj-$(CONFIG_DRM_I915_BPO)     += i915/
+##
+##
+##
+##
+##
+##
 
 # This is a stupid trick to get kbuild to create ubuntu/built-in.o
 obj- += foo.o

diff --git a/ubuntu/i915/Kconfig b/ubuntu/i915/Kconfig
index 4c59793c4ccb6e01865dbfe97efe385b80a8fae1..a4af6d72b5d572d12fd3e30013a5e3b98661b35b 100644 (file)
--- a/ubuntu/i915/Kconfig
+++ b/ubuntu/i915/Kconfig
@@ -1,4 +1,4 @@
-config DRM_I915
+config DRM_I915_BPO
        tristate "Intel 8xx/9xx/G3x/G4x/HD Graphics"
        depends on DRM
        depends on X86 && PCI

diff --git a/ubuntu/i915/Makefile b/ubuntu/i915/Makefile
index 0851de07bd13b59f13ff88e9d05fb7a72fe85604..3a54a18dc6ca69ee731d63f1115420b366b3fd9e 100644 (file)
--- a/ubuntu/i915/Makefile
+++ b/ubuntu/i915/Makefile
@@ -5,7 +5,7 @@
 # Please keep these build lists sorted!
 
 # core driver code
-i915-y := i915_drv.o \
+i915_bpo-y := i915_drv.o \
          i915_irq.o \
          i915_params.o \
           i915_suspend.o \
@@ -14,11 +14,11 @@ i915-y := i915_drv.o \
          intel_pm.o \
          intel_runtime_pm.o
 
-i915-$(CONFIG_COMPAT)   += i915_ioc32.o
-i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o
+i915_bpo-$(CONFIG_COMPAT)   += i915_ioc32.o
+i915_bpo-$(CONFIG_DEBUG_FS) += i915_debugfs.o
 
 # GEM code
-i915-y += i915_cmd_parser.o \
+i915_bpo-y += i915_cmd_parser.o \
          i915_gem_batch_pool.o \
          i915_gem_context.o \
          i915_gem_debug.o \
@@ -41,17 +41,17 @@ i915-y += i915_cmd_parser.o \
          intel_uncore.o
 
 # general-purpose microcontroller (GuC) support
-i915-y += intel_guc_loader.o \
+i915_bpo-y += intel_guc_loader.o \
          i915_guc_submission.o
 
 # autogenerated null render state
-i915-y += intel_renderstate_gen6.o \
+i915_bpo-y += intel_renderstate_gen6.o \
          intel_renderstate_gen7.o \
          intel_renderstate_gen8.o \
          intel_renderstate_gen9.o
 
 # modesetting core code
-i915-y += intel_audio.o \
+i915_bpo-y += intel_audio.o \
          intel_atomic.o \
          intel_atomic_plane.o \
          intel_bios.o \
@@ -65,11 +65,11 @@ i915-y += intel_audio.o \
          intel_psr.o \
          intel_sideband.o \
          intel_sprite.o
-i915-$(CONFIG_ACPI)            += intel_acpi.o intel_opregion.o
-i915-$(CONFIG_DRM_FBDEV_EMULATION)     += intel_fbdev.o
+i915_bpo-$(CONFIG_ACPI)                += intel_acpi.o intel_opregion.o
+i915_bpo-$(CONFIG_DRM_FBDEV_EMULATION) += intel_fbdev.o
 
 # modesetting output/encoder code
-i915-y += dvo_ch7017.o \
+i915_bpo-y += dvo_ch7017.o \
          dvo_ch7xxx.o \
          dvo_ivch.o \
          dvo_ns2501.o \
@@ -92,11 +92,11 @@ i915-y += dvo_ch7017.o \
          intel_tv.o
 
 # virtual gpu code
-i915-y += i915_vgpu.o
+i915_bpo-y += i915_vgpu.o
 
 # legacy horrors
-i915-y += i915_dma.o
+i915_bpo-y += i915_dma.o
 
-obj-$(CONFIG_DRM_I915)  += i915.o
+obj-$(CONFIG_DRM_I915_BPO)  += i915_bpo.o
 
 CFLAGS_i915_trace_points.o := -I$(src)

diff --git a/ubuntu/i915/i915_drv.h b/ubuntu/i915/i915_drv.h
index 64cfd446453cbbf64ae15ef9e34998751e2567e7..c9314e2d5005c52a019d5410561bbf073c640cd8 100644 (file)
--- a/ubuntu/i915/i915_drv.h
+++ b/ubuntu/i915/i915_drv.h
@@ -57,7 +57,7 @@
 /* General customization:
  */
 
-#define DRIVER_NAME            "i915"
+#define DRIVER_NAME            "i915_bpo"
 #define DRIVER_DESC            "Intel Graphics"
 #define DRIVER_DATE            "20160214"