rpms/kernel/F-12 crystalhd-2.6.34-staging.patch, 1.1, 1.2 kernel.spec, 1.1982, 1.1983

Dave Airlie airlied at fedoraproject.org
Wed Jan 13 05:54:22 UTC 2010


Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23991

Modified Files:
	crystalhd-2.6.34-staging.patch kernel.spec 
Log Message:
* Wed Jan 13 2010 Dave Airlie <airlied at redhat.com> 2.6.32.3-23
- crystalhd fix build on powerpc


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/F-12/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 17:04:16 -0000	1.1
+++ crystalhd-2.6.34-staging.patch	13 Jan 2010 05:54:21 -0000	1.2
@@ -27,7 +27,7 @@ diff --git a/drivers/staging/Kconfig b/d
 index 94eb863..61ec152 100644
 --- a/drivers/staging/Kconfig
 +++ b/drivers/staging/Kconfig
-@@ -145,5 +139,7 @@ source "drivers/staging/netwave/Kconfig"
+@@ -145,5 +145,7 @@ source "drivers/staging/netwave/Kconfig"
  
  source "drivers/staging/iio/Kconfig"
  
@@ -39,7 +39,7 @@ diff --git a/drivers/staging/Makefile b/
 index b5e67b8..dc40493 100644
 --- a/drivers/staging/Makefile
 +++ b/drivers/staging/Makefile
-@@ -53,3 +50,4 @@ obj-$(CONFIG_WAVELAN)		+= wavelan/
+@@ -53,3 +53,4 @@ obj-$(CONFIG_WAVELAN)		+= wavelan/
  obj-$(CONFIG_RAR_REGISTER)	+= rar/
  obj-$(CONFIG_DX_SEP)		+= sep/
  obj-$(CONFIG_IIO)		+= iio/
@@ -6918,7 +6918,7 @@ new file mode 100644
 index 0000000..d3f9fc4
 --- /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/F-12/kernel.spec,v
retrieving revision 1.1982
retrieving revision 1.1983
diff -u -p -r1.1982 -r1.1983
--- kernel.spec	13 Jan 2010 04:34:44 -0000	1.1982
+++ kernel.spec	13 Jan 2010 05:54:22 -0000	1.1983
@@ -2021,6 +2021,9 @@ fi
 # and build.
 
 %changelog
+* Wed Jan 13 2010 Dave Airlie <airlied at redhat.com> 2.6.32.3-23
+- crystalhd fix build on powerpc
+
 * Wed Jan 13 2010 Dave Airlie <airlied at redhat.com> 2.6.32.3-22
 - bring back offb handoff patch - fixes G5 + nouveau
 



More information about the scm-commits mailing list