Update, added linux-firmware conflict

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0284fa7b716c..1dcf8784f7db 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-firmware-git-iwlwifi
 	pkgdesc = Emmanuel Grumbach's fork of linux-firmware.git
 	pkgver = 20150722.75cc3ef
-	pkgrel = 2
+	pkgrel = 3
 	url = git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git
 	arch = any
 	license = GPL2
@@ -10,6 +10,7 @@ pkgbase = linux-firmware-git-iwlwifi
 	makedepends = git
 	provides = linux-firmware=20150722.75cc3ef
 	conflicts = linux-firmware-git
+	conflicts = linux-firmware
 	conflicts = kernel26-firmware
 	conflicts = ar9170-fw
 	conflicts = iwlwifi-1000-ucode
diff --git a/PKGBUILD b/PKGBUILD
index 9421025e3d1d..ea3269955ab5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,14 @@
 # Maintainer: Matthew Pallissard <matthew.paul@pallissard.net>
 
 pkgname=linux-firmware-git-iwlwifi
-pkgrel=2
+pkgrel=3
 pkgdesc="Emmanuel Grumbach's fork of linux-firmware.git"
 makedepends=('git')
 arch=('any')
 url="git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git"
 license=('GPL2' 'GPL3' 'custom')
 conflicts=('linux-firmware-git'
+           'linux-firmware'
            'kernel26-firmware'
            'ar9170-fw'
            'iwlwifi-1000-ucode'