From ca0daa4e09abd46a62b985754483ce93981e4aeb Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 9 Apr 2014 22:34:53 +0000
Subject: [PATCH] core/linux-wandboard to 3.0.35-7, fix conflicts

---
 core/linux-wandboard/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/linux-wandboard/PKGBUILD b/core/linux-wandboard/PKGBUILD
index 5828f707d..06da19d97 100644
--- a/core/linux-wandboard/PKGBUILD
+++ b/core/linux-wandboard/PKGBUILD
@@ -8,7 +8,7 @@ _srcname=linux-3.0.35
 _kernelname=${pkgbase#linux}
 _desc="i.MX6 Wandboard"
 pkgver=3.0.35
-pkgrel=6
+pkgrel=7
 rcnrel=wand6
 arch=('armv7h')
 url="http://www.kernel.org/"
@@ -76,7 +76,7 @@ _package() {
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=('kernel26' "linux=${pkgver}")
-  conflicts=('linux-imx6' 'linux-armv7')
+  conflicts=('linux')
   install=${pkgname}.install
 
   cd "${srcdir}/${_srcname}"
@@ -121,7 +121,7 @@ _package() {
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for linux kernel - ${_desc}"
   provides=("linux-headers=${pkgver}")
-  conflicts=('linux-headers-imx6' 'linux-armv7-headers')
+  conflicts=('linux-headers')
 
   install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"