[packages/kernel/LINUX_3_7: 2/2] - merge building of firewire modules on i386 - rel. 4

[draenog]

commit a8104ce7aa2294e80b118679a2067e1a7585adc8
Merge: 57ad53f b0ef634
Author: Kacper Kornet <draenog at pld-linux.org>
Date:   Sat Apr 13 16:33:51 2013 +0100

    - merge building of firewire modules on i386
    - rel. 4

 kernel-multiarch.config | 2 +-
 kernel.spec             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --cc kernel.spec
index 1f9d665,d8b388c..034191a
--- a/kernel.spec
+++ b/kernel.spec
@@@ -66,9 -89,9 +66,9 @@@
  %define		have_pcmcia	0
  %endif
  
- %define		rel		3
 -%define		rel		1
 -%define		basever		3.4
 -%define		postver		.6
++%define		rel		4
 +%define		basever		3.7
 +%define		postver		.10
  
  # __alt_kernel is list of features, empty string if none set
  # _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
diff --cc kernel-multiarch.config
index 99c5653,d08d0a4..6397ecb
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@@ -726,18 -700,9 +726,18 @@@ EISA_VIRTUAL_ROOT alpha=y i386=
  EISA_NAMES alpha=y i386=y
  
  #-
 +#- *** FILE: drivers/extcon/Kconfig ***
 +#-
 +EXTCON all=m
 +#- Extcon Device Drivers
 +EXTCON_GPIO all=m
 +EXTCON_ADC_JACK all=m
 +EXTCON_ARIZONA all=m
 +
 +#-
  #- *** FILE: drivers/firewire/Kconfig ***
  #-
- FIREWIRE all=n ia64=m ppc=m ppc64=m x86_64=m
+ FIREWIRE all=m
  FIREWIRE_OHCI all=m
  FIREWIRE_SBP2 all=m
  FIREWIRE_NET all=m
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/a8104ce7aa2294e80b118679a2067e1a7585adc8