From subversion@balloonboard.org Wed Mar 14 08:50:24 2012
Received: from nick by stoneboat.aleph1.co.uk with local (Exim 4.72)
	(envelope-from <subversion@balloonboard.org>) id 1S7jua-0007yK-Ac
	for balloon-svn@balloonboard.org; Wed, 14 Mar 2012 08:50:24 +0000
Message-Id: <E1S7jua-0007yK-Ac@stoneboat.aleph1.co.uk>
Date: Wed, 14 Mar 2012 08:50:24 +0000
To: balloon-svn@balloonboard.org
From: subversion@balloonboard.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-SA-Exim-Connect-IP: <locally generated>
X-SA-Exim-Mail-From: subversion@balloonboard.org
X-SA-Exim-Scanned: No (on stoneboat.aleph1.co.uk);
	SAEximRunCond expanded to false
Subject: [Balloon-svn] r1850 -
	balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4
X-BeenThere: balloon-svn@balloonboard.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: <balloon-svn.balloonboard.org>
List-Unsubscribe: <http://balloonboard.org/cgi-bin/mailman/options/balloon-svn>, 
	<mailto:balloon-svn-request@balloonboard.org?subject=unsubscribe>
List-Archive: <http://balloonboard.org/lurker/list/balloon-svn.html>
List-Post: <mailto:balloon-svn@balloonboard.org>
List-Help: <mailto:balloon-svn-request@balloonboard.org?subject=help>
List-Subscribe: <http://balloonboard.org/cgi-bin/mailman/listinfo/balloon-svn>, 
	<mailto:balloon-svn-request@balloonboard.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Mar 2012 08:50:24 -0000

Author: nick
Date: 2012-03-14 08:50:24 +0000 (Wed, 14 Mar 2012)
New Revision: 1850

Modified:
   balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/balloon3-samosa.patch
Log:
remove conditional on TT to avoid DEVICE_ATTR error

Modified: balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/balloon3-samosa.patch
===================================================================
--- balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/balloon3-samosa.patch	2012-03-13 17:32:21 UTC (rev 1849)
+++ balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/balloon3-samosa.patch	2012-03-14 08:50:24 UTC (rev 1850)
@@ -9,8 +9,8 @@
 
 Index: linux-2.6.39.4/drivers/char/Makefile
 ===================================================================
---- linux-2.6.39.4.orig/drivers/char/Makefile	2012-01-19 16:16:30.000000000 +0000
-+++ linux-2.6.39.4/drivers/char/Makefile	2012-01-19 17:42:28.000000000 +0000
+--- linux-2.6.39.4.orig/drivers/char/Makefile	2011-08-03 20:43:28.000000000 +0100
++++ linux-2.6.39.4/drivers/char/Makefile	2012-03-14 08:47:49.000000000 +0000
 @@ -63,3 +63,5 @@
  
  obj-$(CONFIG_JS_RTC)		+= js-rtc.o
@@ -19,8 +19,8 @@
 +obj-$(CONFIG_SAMOSA)		+= samosa.o
 Index: linux-2.6.39.4/drivers/char/Kconfig
 ===================================================================
---- linux-2.6.39.4.orig/drivers/char/Kconfig	2012-01-19 16:16:30.000000000 +0000
-+++ linux-2.6.39.4/drivers/char/Kconfig	2012-01-19 17:42:28.000000000 +0000
+--- linux-2.6.39.4.orig/drivers/char/Kconfig	2011-08-03 20:43:28.000000000 +0100
++++ linux-2.6.39.4/drivers/char/Kconfig	2012-03-14 08:47:49.000000000 +0000
 @@ -616,5 +616,29 @@
  	  Enables userspace clients to read and write to some packet SMD
  	  ports via device interface for MSM chipset.
@@ -54,7 +54,7 @@
 Index: linux-2.6.39.4/drivers/char/samosa.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.39.4/drivers/char/samosa.c	2012-01-19 17:40:41.000000000 +0000
++++ linux-2.6.39.4/drivers/char/samosa.c	2012-03-14 08:47:43.000000000 +0000
 @@ -0,0 +1,1171 @@
 +/*
 + * drivers/char/samosa.c
@@ -104,18 +104,18 @@
 +#ifdef CONFIG_MACH_BALLOON3
 +/* balloon3 version */
 +
-+#ifdef CONFIG_BALLOON3_TT
++//#ifdef CONFIG_BALLOON3_TT
 +static ssize_t show_cpld_version(struct device *d,
 +		struct device_attribute *attr, char *buf)
 +{
 +	return sprintf(buf, "0x%x\n", samosa_read8(0xff));
 +}
-+#endif
++//#endif
 +
 +static DEVICE_ATTR(cpld_version, S_IRUGO,
-+#ifdef CONFIG_BALLOON3_TT
++//#ifdef CONFIG_BALLOON3_TT
 +		show_cpld_version,
-+#endif
++//#endif
 +		NULL);
 +
 +static struct attribute *samosa_sysfs_entries[] = {
@@ -1230,7 +1230,7 @@
 Index: linux-2.6.39.4/include/linux/samosa_device.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.39.4/include/linux/samosa_device.h	2012-01-19 16:16:35.000000000 +0000
++++ linux-2.6.39.4/include/linux/samosa_device.h	2012-03-10 23:12:16.000000000 +0000
 @@ -0,0 +1,92 @@
 +/*
 + * drivers/char/samosa.h