From e8c0dae39ee05c372b57bce4bb64771db4ad26c8 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@redhat.com>
Date: Wed, 23 Mar 2011 08:55:25 -0400
Subject: [PATCH] Update to 2.6.38-git12

Enable I2C_DIOLAN_U2C USB i2c adapter [all], I2C_PXA [i686].
---
 .gitignore         | 2 +-
 config-generic     | 2 ++
 config-x86-generic | 1 +
 kernel.spec        | 6 +++++-
 sources            | 2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 49ab28ced..78e9c270c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@ patch-*.bz2
 clog
 *.rpm
 kernel-2.6.*/
-patch-2.6.38-git11.bz2
+patch-2.6.38-git12.bz2
diff --git a/config-generic b/config-generic
index 365b7ccd6..26f9d696d 100644
--- a/config-generic
+++ b/config-generic
@@ -2150,6 +2150,8 @@ CONFIG_I2C_TINY_USB=m
 # CONFIG_I2C_DESIGNWARE is not set
 # CONFIG_I2C_XILINX is not set
 
+CONFIG_I2C_DIOLAN_U2C=m
+
 #
 # I2C Hardware Sensors Chip support
 #
diff --git a/config-x86-generic b/config-x86-generic
index 52ab8a151..888c15179 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -488,6 +488,7 @@ CONFIG_SFI=y
 
 CONFIG_INPUT_WINBOND_CIR=m
 CONFIG_I2C_SCMI=m
+CONFIG_I2C_PXA=m
 CONFIG_SBC_FITPC2_WATCHDOG=m
 CONFIG_EDAC_I3200=m
 CONFIG_EDAC_DECODE_MCE=m
diff --git a/kernel.spec b/kernel.spec
index 6ea2935de..12f2b9927 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -84,7 +84,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 11
+%define gitrev 12
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1954,6 +1954,10 @@ fi
 # and build.
 
 %changelog
+* Wed Mar 23 2011 Kyle McMartin <kmcmartin@redhat.com>
+- Update to 2.6.38-git12
+- Enable I2C_DIOLAN_U2C USB i2c adapter [all], I2C_PXA [i686].
+
 * Tue Mar 22 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.39-0.rc0.git11.0
 - Update to 2.6.38-git11
 - Drop merged fs-call-security_d_instantiate-in-d_obtain_alias.patch
diff --git a/sources b/sources
index a13225ed1..6e4b91f48 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 7d471477bfa67546f902da62227fa976  linux-2.6.38.tar.bz2
-c71f1f27a98b50ecb8b1c5be51f10260  patch-2.6.38-git11.bz2
+aa0bf1ba29d3df6c0cddb953d846da43  patch-2.6.38-git12.bz2