[kernel/f17] Fix whitespace corruption in linux-3.6-arm-build-fixup.patch

Josh Boyer jwboyer at fedoraproject.org
Sat Oct 13 12:11:01 UTC 2012


commit c05f8b9272f41f5ac2725a59e45b3e693e5c679a
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Sat Oct 13 08:08:08 2012 -0400

    Fix whitespace corruption in linux-3.6-arm-build-fixup.patch

 config-arm-generic              |    1 +
 kernel.spec                     |    3 +++
 linux-3.6-arm-build-fixup.patch |   12 ++++++------
 3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/config-arm-generic b/config-arm-generic
index 0a253eb..6f1abe1 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -354,3 +354,4 @@ CONFIG_EXTCON_GPIO=m
 
 # CONFIG_NET_VENDOR_CIRRUS is not set
 # CONFIG_CS89x0 is not set
+# CONFIG_VIDEO_DM6446_CCDC is not set
diff --git a/kernel.spec b/kernel.spec
index 18348fe..49f2e92 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2309,6 +2309,9 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Sat Oct 13 2012 Josh Boyer <jwboyer at redhat.com>
+- Fix whitespace corruption in linux-3.6-arm-build-fixup.patch
+
 * Tue Oct  9 2012 Peter Robinson <pbrobinson at fedoraproject.org>
 - Update ARM configurations
 
diff --git a/linux-3.6-arm-build-fixup.patch b/linux-3.6-arm-build-fixup.patch
index f51df06..c9ee5ab 100644
--- a/linux-3.6-arm-build-fixup.patch
+++ b/linux-3.6-arm-build-fixup.patch
@@ -93,11 +93,11 @@ index 4beab94..44149ee 100644
 --- a/drivers/staging/omapdrm/omap_drv.c
 +++ b/drivers/staging/omapdrm/omap_drv.c
 @@ -761,7 +761,6 @@ static struct drm_driver omap_drm_driver = {
-                .irq_postinstall = dev_irq_postinstall,
-                .irq_uninstall = dev_irq_uninstall,
-                .irq_handler = dev_irq_handler,
--               .reclaim_buffers = drm_core_reclaim_buffers,
+ 		.irq_postinstall = dev_irq_postinstall,
+ 		.irq_uninstall = dev_irq_uninstall,
+ 		.irq_handler = dev_irq_handler,
+-		.reclaim_buffers = drm_core_reclaim_buffers,
  #ifdef CONFIG_DEBUG_FS
-                .debugfs_init = omap_debugfs_init,
-                .debugfs_cleanup = omap_debugfs_cleanup,
+ 		.debugfs_init = omap_debugfs_init,
+ 		.debugfs_cleanup = omap_debugfs_cleanup,
   


More information about the scm-commits mailing list