rpms/kernel/devel crystalhd-2.6.34-staging.patch, 1.1, 1.2 kernel.spec, 1.1901, 1.1902

[Jarod Wilson]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8060

Modified Files:
	crystalhd-2.6.34-staging.patch kernel.spec 
Log Message:
* Thu Jan 21 2010 Jarod Wilson <jarod at redhat.com>
- Merge crystalhd powerpc build fix from airlied


crystalhd-2.6.34-staging.patch:
 Kconfig                     |    2 
 Makefile                    |    1 
 crystalhd/Kconfig           |    6 
 crystalhd/Makefile          |    6 
 crystalhd/TODO              |   16 
 crystalhd/bc_dts_defs.h     |  498 +++++++++
 crystalhd/bc_dts_glob_lnx.h |  299 +++++
 crystalhd/bc_dts_types.h    |  121 ++
 crystalhd/bcm_70012_regs.h  |  757 +++++++++++++
 crystalhd/crystalhd_cmds.c  | 1058 +++++++++++++++++++
 crystalhd/crystalhd_cmds.h  |   88 +
 crystalhd/crystalhd_fw_if.h |  369 ++++++
 crystalhd/crystalhd_hw.c    | 2395 ++++++++++++++++++++++++++++++++++++++++++++
 crystalhd/crystalhd_hw.h    |  398 +++++++
 crystalhd/crystalhd_lnx.c   |  780 ++++++++++++++
 crystalhd/crystalhd_lnx.h   |   96 +
 crystalhd/crystalhd_misc.c  | 1029 ++++++++++++++++++
 crystalhd/crystalhd_misc.h  |  229 ++++
 18 files changed, 8148 insertions(+)

Index: crystalhd-2.6.34-staging.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/crystalhd-2.6.34-staging.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- crystalhd-2.6.34-staging.patch	12 Jan 2010 22:06:10 -0000	1.1
+++ crystalhd-2.6.34-staging.patch	21 Jan 2010 19:19:38 -0000	1.2
@@ -18,10 +18,10 @@ Signed-off-by: Jarod Wilson <jarod at redha
  drivers/staging/crystalhd/crystalhd_hw.c    | 2395 +++++++++++++++++++++++++++
  drivers/staging/crystalhd/crystalhd_hw.h    |  398 +++++
  drivers/staging/crystalhd/crystalhd_lnx.c   |  780 +++++++++
- drivers/staging/crystalhd/crystalhd_lnx.h   |   95 ++
+ drivers/staging/crystalhd/crystalhd_lnx.h   |   96 ++
  drivers/staging/crystalhd/crystalhd_misc.c  | 1029 ++++++++++++
  drivers/staging/crystalhd/crystalhd_misc.h  |  229 +++
- 18 files changed, 8147 insertions(+), 0 deletions(-)
+ 18 files changed, 8148 insertions(+), 0 deletions(-)
 
 diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
 index 94eb863..61ec152 100644
@@ -6915,10 +6915,10 @@ index 0000000..1f36b4d
 +
 diff --git a/drivers/staging/crystalhd/crystalhd_lnx.h b/drivers/staging/crystalhd/crystalhd_lnx.h
 new file mode 100644
-index 0000000..d3f9fc4
+index 0000000..d338ae9
 --- /dev/null
 +++ b/drivers/staging/crystalhd/crystalhd_lnx.h
-@@ -0,0 +1,95 @@
+@@ -0,0 +1,96 @@
 +/***************************************************************************
 + * Copyright (c) 2005-2009, Broadcom Corporation.
 + *
@@ -6961,6 +6961,7 @@ index 0000000..d3f9fc4
 +#include <linux/init.h>
 +#include <linux/interrupt.h>
 +#include <linux/pagemap.h>
++#include <linux/vmalloc.h>
 +
 +#include <asm/io.h>
 +#include <asm/irq.h>


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1901
retrieving revision 1.1902
diff -u -p -r1.1901 -r1.1902
--- kernel.spec	20 Jan 2010 16:05:06 -0000	1.1901
+++ kernel.spec	21 Jan 2010 19:19:39 -0000	1.1902
@@ -1971,6 +1971,9 @@ fi
 # and build.
 
 %changelog
+* Thu Jan 21 2010 Jarod Wilson <jarod at redhat.com>
+- Merge crystalhd powerpc build fix from airlied
+
 * Wed Jan 20 2010 Kyle McMartin <kyle at redhat.com> 2.6.33-0.18.rc4.git7
 - 2.6.32-rc4-git7
 - dvb mantis drivers as modules