aspeed: g6: Use the usual kernel

Switch g6 to the same kernel as the other supported chips (g4 and g5).

(From meta-aspeed rev: f28c73a9f2e0296c1730b88afdc6cf0c836d08fa)

Change-Id: I659e535ccb4642438b9c10c48a4850d67b28982b
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-aspeed/conf/machine/include/aspeed.inc b/meta-aspeed/conf/machine/include/aspeed.inc
index a8d2a3b..d651a84 100644
--- a/meta-aspeed/conf/machine/include/aspeed.inc
+++ b/meta-aspeed/conf/machine/include/aspeed.inc
@@ -3,7 +3,6 @@
 PREFERRED_PROVIDER_u-boot ?= "u-boot-aspeed"
 PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-fw-utils-aspeed"
 
-PREFERRED_PROVIDER_virtual/kernel_aspeed-g6 ?= "linux-aspeed-sdk"
 PREFERRED_PROVIDER_virtual/bootloader_aspeed-g6 ?= "u-boot-aspeed-sdk"
 PREFERRED_PROVIDER_u-boot_aspeed-g6 ?= "u-boot-aspeed-sdk"
 PREFERRED_PROVIDER_u-boot-fw-utils_aspeed-g6 ?= "u-boot-fw-utils-aspeed-sdk"
diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed-sdk/aspeed-g6/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed-sdk/aspeed-g6/defconfig
new file mode 120000
index 0000000..d6ee021
--- /dev/null
+++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed-sdk/aspeed-g6/defconfig
@@ -0,0 +1 @@
+../../linux-aspeed/aspeed-g6/defconfig
\ No newline at end of file
diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed-sdk/aspeed-g6/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig
similarity index 100%
rename from meta-aspeed/recipes-kernel/linux/linux-aspeed-sdk/aspeed-g6/defconfig
rename to meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig