[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-495-g91a77a5

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  91a77a5abcfe15151e2ff8b8cb897e3ccc5b920b (commit)
      from  f0d5dd6d8f9300da5540ae2994aaa8abb6cb4e94 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 91a77a5abcfe15151e2ff8b8cb897e3ccc5b920b
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Oct 23 17:05:50 2013 +0200

    [LINUX] [COMMON] Makes mcp7940x RTC driver compiles again on non device tree kernels

-----------------------------------------------------------------------

Summary of changes:
 .../000-armadeus-add_mcp7940x_rtc_driver.patch     |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/patches/linux/common/000-armadeus-add_mcp7940x_rtc_driver.patch b/patches/linux/common/000-armadeus-add_mcp7940x_rtc_driver.patch
index fef2f0b..2bbe1db 100644
--- a/patches/linux/common/000-armadeus-add_mcp7940x_rtc_driver.patch
+++ b/patches/linux/common/000-armadeus-add_mcp7940x_rtc_driver.patch
@@ -7,7 +7,7 @@ Index: linux-3.11.1/drivers/rtc/rtc-mcp7940x.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ linux-3.11.1/drivers/rtc/rtc-mcp7940x.c	2013-10-05 09:29:52.179513345 +0200
-@@ -0,0 +1,511 @@
+@@ -0,0 +1,513 @@
 +/*
 + * RTC client/driver for the Microchip MCP7940x Real-Time Clock over I2C
 + *
@@ -490,7 +490,9 @@ Index: linux-3.11.1/drivers/rtc/rtc-mcp7940x.c
 +	.driver = {
 +		.name = "rtc-mcp7940x",
 +		.owner = THIS_MODULE,
++#if defined(CONFIG_OF)
 +		.of_match_table = mcp7940x_rtc_dt_match,
++#endif
 +	},
 +	.probe = mcp7940x_probe,
 +	.suspend = mcp7940x_suspend,


hooks/post-receive
-- 
armadeus