archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-03-19 00:21:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/linux-kirkwood fix gpio problems related to bubba3 gpio driver.(Fixes #558)

Browse source
This commit is contained in:
moonman 2013-09-06 05:15:03 -06:00
parent 025c8385f3
commit 489be60128
2 changed files with 53 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/linux-kirkwood/PKGBUILD
View file

@ -9,7 +9,7 @@ pkgname=('linux-kirkwood' 'linux-headers-kirkwood')
_kernelname=${pkgname#linux}
_basekernel=3.10.10
pkgver=${_basekernel}
pkgrel=1
pkgrel=2
cryptover=1.6
bfqver=v6r2
arch=('arm')
@ -30,7 +30,7 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.xz"
"0001-block-Switch-from-BFQ-v6r2-for-3.10.0-to-BFQ-v6r2-fo.patch")
md5sums=('647f76225dd6bc112369ba573ba3de18'
'f5cd168fa99344a258172a9201cddeff'
'b608eac5d7d8fdac4d62412a8b4f6bf7'
'ec13d33d2d51ef47c530fd26e6955922'
'SKIP'
'80b2fb500e6811495c6b072d7e6fd112'

96
core/linux-kirkwood/archlinuxarm.patch
View file

@ -1,5 +1,5 @@
diff -ruN a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi 2013-08-20 16:40:47.000000000 -0600
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi 2013-08-29 10:47:51.000000000 -0600
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi 1969-12-31 17:00:00.000000000 -0700
@@ -1,78 +0,0 @@
-/include/ "kirkwood.dtsi"
@ -82,8 +82,8 @@ diff -ruN a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-t
-};
diff -ruN a/arch/arm/mach-kirkwood/bubba3-gpio.c b/arch/arm/mach-kirkwood/bubba3-gpio.c
--- a/arch/arm/mach-kirkwood/bubba3-gpio.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/bubba3-gpio.c 2013-08-27 03:05:13.196623262 -0600
@@ -0,0 +1,386 @@
+++ b/arch/arm/mach-kirkwood/bubba3-gpio.c 2013-09-06 05:02:11.765210478 -0600
@@ -0,0 +1,392 @@
+/*
+ * Excito BUBBA|3 led driver.
+ *
@ -104,6 +104,7 @@ diff -ruN a/arch/arm/mach-kirkwood/bubba3-gpio.c b/arch/arm/mach-kirkwood/bubba3
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/bubba3.h>
+#include <asm/mach-types.h>
+
+/* Mark this file for ident */
+static char* ver="0.1";
@ -444,6 +445,11 @@ diff -ruN a/arch/arm/mach-kirkwood/bubba3-gpio.c b/arch/arm/mach-kirkwood/bubba3
+static int __init bubba3_init(void){
+ int result;
+
+ if(!machine_is_bubba3()){
+ return -EINVAL;
+ }
+
+
+ result = platform_driver_register(&b3_driver);
+ if (result < 0) {
+ printk(KERN_ERR "bubba3: Failed to register driver\n");
@ -472,7 +478,7 @@ diff -ruN a/arch/arm/mach-kirkwood/bubba3-gpio.c b/arch/arm/mach-kirkwood/bubba3
+module_exit(bubba3_cleanup);
diff -ruN a/arch/arm/mach-kirkwood/bubba3-setup.c b/arch/arm/mach-kirkwood/bubba3-setup.c
--- a/arch/arm/mach-kirkwood/bubba3-setup.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/bubba3-setup.c 2013-08-27 02:48:37.841660422 -0600
+++ b/arch/arm/mach-kirkwood/bubba3-setup.c 2013-09-06 04:59:48.925126133 -0600
@@ -0,0 +1,234 @@
+/*
+ * arch/arm/mach-kirkwood/bubba3-setup.c
@ -709,8 +715,8 @@ diff -ruN a/arch/arm/mach-kirkwood/bubba3-setup.c b/arch/arm/mach-kirkwood/bubba
+ .restart = kirkwood_restart,
+MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
--- a/arch/arm/mach-kirkwood/common.h 2013-08-20 16:40:47.000000000 -0600
+++ b/arch/arm/mach-kirkwood/common.h 2013-08-27 01:49:46.547377928 -0600
--- a/arch/arm/mach-kirkwood/common.h 2013-08-29 10:47:51.000000000 -0600
+++ b/arch/arm/mach-kirkwood/common.h 2013-09-06 04:59:48.935128810 -0600
@@ -77,12 +77,6 @@
static inline void dnskw_init(void) {};
#endif
@ -738,8 +744,8 @@ diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
void lsxl_init(void);
#else
diff -ruN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c
--- a/arch/arm/mach-kirkwood/dockstar-setup.c 2013-08-20 16:40:47.000000000 -0600
+++ b/arch/arm/mach-kirkwood/dockstar-setup.c 2013-08-27 01:49:46.547377928 -0600
--- a/arch/arm/mach-kirkwood/dockstar-setup.c 2013-08-29 10:47:51.000000000 -0600
+++ b/arch/arm/mach-kirkwood/dockstar-setup.c 2013-09-06 04:59:48.935128810 -0600
@@ -28,6 +28,10 @@
.offset = 0,
.size = SZ_1M
@ -785,7 +791,7 @@ diff -ruN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/doc
diff -ruN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/goflexhome-setup.c
--- a/arch/arm/mach-kirkwood/goflexhome-setup.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c 2013-08-27 01:49:46.557377734 -0600
+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c 2013-09-06 04:59:48.935128810 -0600
@@ -0,0 +1,124 @@
+/*
+ * arch/arm/mach-kirkwood/goflexhome-setup.c
@ -913,7 +919,7 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/g
+
diff -ruN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/goflexnet-setup.c
--- a/arch/arm/mach-kirkwood/goflexnet-setup.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c 2013-08-27 01:49:46.557377734 -0600
+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c 2013-09-06 04:59:48.945131365 -0600
@@ -0,0 +1,177 @@
+/*
+ * arch/arm/mach-kirkwood/goflexnet-setup.c
@ -1093,8 +1099,8 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/go
+MACHINE_END
+
diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c
--- a/arch/arm/mach-kirkwood/guruplug-setup.c 2013-08-20 16:40:47.000000000 -0600
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c 2013-08-27 01:49:46.557377734 -0600
--- a/arch/arm/mach-kirkwood/guruplug-setup.c 2013-08-29 10:47:51.000000000 -0600
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c 2013-09-06 04:59:48.945131365 -0600
@@ -59,22 +59,24 @@
static struct gpio_led guruplug_led_pins[] = {
@ -1126,7 +1132,7 @@ diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/gur
},
diff -ruN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/iconnect-setup.c
--- a/arch/arm/mach-kirkwood/iconnect-setup.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/iconnect-setup.c 2013-08-27 01:49:46.567377540 -0600
+++ b/arch/arm/mach-kirkwood/iconnect-setup.c 2013-09-06 04:59:48.945131365 -0600
@@ -0,0 +1,204 @@
+/*
+ * arch/arm/mach-kirkwood/iconnect-setup.c
@ -1334,7 +1340,7 @@ diff -ruN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/ico
+MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwood/ionics-stratus-setup.c
--- a/arch/arm/mach-kirkwood/ionics-stratus-setup.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c 2013-08-27 01:49:46.567377540 -0600
+++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c 2013-09-06 04:59:48.945131365 -0600
@@ -0,0 +1,137 @@
+/*
+ * arch/arm/mach-kirkwood/ionics-stratus-setup.c
@ -1474,8 +1480,8 @@ diff -ruN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwo
+ .restart = kirkwood_restart,
+MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
--- a/arch/arm/mach-kirkwood/Kconfig 2013-08-20 16:40:47.000000000 -0600
+++ b/arch/arm/mach-kirkwood/Kconfig 2013-08-27 02:50:24.830136703 -0600
--- a/arch/arm/mach-kirkwood/Kconfig 2013-08-29 10:47:51.000000000 -0600
+++ b/arch/arm/mach-kirkwood/Kconfig 2013-09-06 04:59:48.955133836 -0600
@@ -92,6 +92,12 @@
Say 'Y' here if you want your kernel to support the
Marvell OpenRD Ultimate Board.
@ -1619,8 +1625,8 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
endif
diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
--- a/arch/arm/mach-kirkwood/Makefile 2013-08-20 16:40:47.000000000 -0600
+++ b/arch/arm/mach-kirkwood/Makefile 2013-08-27 02:52:24.530697569 -0600
--- a/arch/arm/mach-kirkwood/Makefile 2013-08-29 10:47:51.000000000 -0600
+++ b/arch/arm/mach-kirkwood/Makefile 2013-09-06 04:59:48.955133836 -0600
@@ -18,16 +18,25 @@
obj-$(CONFIG_MACH_T5325) += t5325-setup.o
obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o
@ -1660,7 +1666,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
-obj-$(CONFIG_MACH_TS219_DT) += board-ts219.o tsx1x-common.o
diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6210-setup.c
--- a/arch/arm/mach-kirkwood/nas6210-setup.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/nas6210-setup.c 2013-08-27 01:49:46.577377347 -0600
+++ b/arch/arm/mach-kirkwood/nas6210-setup.c 2013-09-06 04:59:48.955133836 -0600
@@ -0,0 +1,186 @@
+/*
+ * arch/arm/mach-kirkwood/nas6210-setup.c
@ -1850,7 +1856,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6
+MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa310-setup.c
--- a/arch/arm/mach-kirkwood/nsa310-setup.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/nsa310-setup.c 2013-08-27 01:49:46.577377347 -0600
+++ b/arch/arm/mach-kirkwood/nsa310-setup.c 2013-09-06 04:59:48.965136025 -0600
@@ -0,0 +1,359 @@
+/*
+ * arch/arm/mach-kirkwood/nsa310-setup.c
@ -2213,7 +2219,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa31
+MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa320-setup.c
--- a/arch/arm/mach-kirkwood/nsa320-setup.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/nsa320-setup.c 2013-08-27 01:49:46.577377347 -0600
+++ b/arch/arm/mach-kirkwood/nsa320-setup.c 2013-09-06 04:59:48.965136025 -0600
@@ -0,0 +1,305 @@
+/*
+ * arch/arm/mach-kirkwood/nsa320-setup.c
@ -2522,7 +2528,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa32
+MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pogo_e02-setup.c
--- a/arch/arm/mach-kirkwood/pogo_e02-setup.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c 2013-08-27 01:49:46.577377347 -0600
+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c 2013-09-06 04:59:48.965136025 -0600
@@ -0,0 +1,115 @@
+/*
+ * arch/arm/mach-kirkwood/pogo_e02-setup.c
@ -2641,7 +2647,7 @@ diff -ruN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pog
+MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/pogoplugv4-setup.c
--- a/arch/arm/mach-kirkwood/pogoplugv4-setup.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c 2013-08-27 01:49:46.587377155 -0600
+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c 2013-09-06 04:59:48.975138092 -0600
@@ -0,0 +1,195 @@
+/*
+ * arch/arm/mach-kirkwood/pogoplugv4-setup.c
@ -2839,8 +2845,8 @@ diff -ruN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/p
+ .restart = kirkwood_restart,
+MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c 2013-08-20 16:40:47.000000000 -0600
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c 2013-08-27 01:49:46.587377155 -0600
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c 2013-08-29 10:47:51.000000000 -0600
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c 2013-09-06 04:59:48.975138092 -0600
@@ -43,7 +43,7 @@
.phy_addr = MV643XX_ETH_PHY_ADDR(0),
};
@ -2924,7 +2930,7 @@ diff -ruN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/s
diff -ruN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topkick-setup.c
--- a/arch/arm/mach-kirkwood/topkick-setup.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/topkick-setup.c 2013-08-27 01:49:46.587377155 -0600
+++ b/arch/arm/mach-kirkwood/topkick-setup.c 2013-09-06 04:59:48.975138092 -0600
@@ -0,0 +1,165 @@
+/*
+ * arch/arm/mach-kirkwood/topkick-setup.c
@ -3092,8 +3098,8 @@ diff -ruN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topk
+ .restart = kirkwood_restart,
+MACHINE_END
diff -ruN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
--- a/arch/arm/plat-orion/common.c 2013-08-20 16:40:47.000000000 -0600
+++ b/arch/arm/plat-orion/common.c 2013-08-27 01:49:46.597376964 -0600
--- a/arch/arm/plat-orion/common.c 2013-08-29 10:47:51.000000000 -0600
+++ b/arch/arm/plat-orion/common.c 2013-09-06 04:59:48.995141858 -0600
@@ -256,7 +256,9 @@
/*****************************************************************************
* GE00
@ -3106,8 +3112,8 @@ diff -ruN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
static struct resource orion_ge00_shared_resources[] = {
{
diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
--- a/drivers/ata/sata_mv.c 2013-08-20 16:40:47.000000000 -0600
+++ b/drivers/ata/sata_mv.c 2013-08-27 01:49:46.627376388 -0600
--- a/drivers/ata/sata_mv.c 2013-08-29 10:47:51.000000000 -0600
+++ b/drivers/ata/sata_mv.c 2013-09-06 04:59:49.025146634 -0600
@@ -71,6 +71,7 @@
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_device.h>
@ -3126,8 +3132,8 @@ diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
int using_ncq = ((pp->pp_flags & MV_PP_FLAG_NCQ_EN) != 0);
if (want_ncq != using_ncq)
diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
--- a/drivers/hwmon/Kconfig 2013-08-20 16:40:47.000000000 -0600
+++ b/drivers/hwmon/Kconfig 2013-08-27 01:49:46.637376195 -0600
--- a/drivers/hwmon/Kconfig 2013-08-29 10:47:51.000000000 -0600
+++ b/drivers/hwmon/Kconfig 2013-09-06 04:59:49.045149344 -0600
@@ -1528,6 +1528,19 @@
help
Support for the A/D converter on MC13783 and MC13892 PMIC.
@ -3149,8 +3155,8 @@ diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
comment "ACPI drivers"
diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
--- a/drivers/hwmon/Makefile 2013-08-20 16:40:47.000000000 -0600
+++ b/drivers/hwmon/Makefile 2013-08-27 01:49:46.647376003 -0600
--- a/drivers/hwmon/Makefile 2013-08-29 10:47:51.000000000 -0600
+++ b/drivers/hwmon/Makefile 2013-09-06 04:59:49.075154509 -0600
@@ -107,6 +107,7 @@
obj-$(CONFIG_SENSORS_MAX6650) += max6650.o
obj-$(CONFIG_SENSORS_MAX6697) += max6697.o
@ -3161,7 +3167,7 @@ diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
obj-$(CONFIG_SENSORS_NTC_THERMISTOR) += ntc_thermistor.o
diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
--- a/drivers/hwmon/nsa3xx-hwmon.c 1969-12-31 17:00:00.000000000 -0700
+++ b/drivers/hwmon/nsa3xx-hwmon.c 2013-08-27 01:49:46.647376003 -0600
+++ b/drivers/hwmon/nsa3xx-hwmon.c 2013-09-06 04:59:49.075154509 -0600
@@ -0,0 +1,251 @@
+/*
+ * drivers/hwmon/nsa3xx-hwmon.c
@ -3415,8 +3421,8 @@ diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:nsa3xx-hwmon");
diff -ruN a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
--- a/drivers/leds/trigger/Kconfig 2013-08-20 16:40:47.000000000 -0600
+++ b/drivers/leds/trigger/Kconfig 2013-08-27 01:49:46.677375426 -0600
--- a/drivers/leds/trigger/Kconfig 2013-08-29 10:47:51.000000000 -0600
+++ b/drivers/leds/trigger/Kconfig 2013-09-06 04:59:49.105159319 -0600
@@ -35,7 +35,6 @@
config LEDS_TRIGGER_IDE_DISK
@ -3426,8 +3432,8 @@ diff -ruN a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
help
This allows LEDs to be controlled by IDE disk activity.
diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
--- a/drivers/mmc/core/core.c 2013-08-20 16:40:47.000000000 -0600
+++ b/drivers/mmc/core/core.c 2013-08-27 01:49:46.657375810 -0600
--- a/drivers/mmc/core/core.c 2013-08-29 10:47:51.000000000 -0600
+++ b/drivers/mmc/core/core.c 2013-09-06 04:59:49.115160531 -0600
@@ -785,7 +785,7 @@
*/
limit_us = 3000000;
@ -3438,8 +3444,8 @@ diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
/*
* SDHC cards always use these fixed values.
diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
--- a/drivers/mmc/core/sd.c 2013-08-20 16:40:47.000000000 -0600
+++ b/drivers/mmc/core/sd.c 2013-08-27 01:49:46.657375810 -0600
--- a/drivers/mmc/core/sd.c 2013-08-29 10:47:51.000000000 -0600
+++ b/drivers/mmc/core/sd.c 2013-09-06 04:59:49.125161658 -0600
@@ -355,6 +355,15 @@
return -ENOMEM;
}
@ -3457,8 +3463,8 @@ diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
if (err)
goto out;
diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
--- a/drivers/mmc/host/mvsdio.c 2013-08-20 16:40:47.000000000 -0600
+++ b/drivers/mmc/host/mvsdio.c 2013-08-27 01:49:46.667375618 -0600
--- a/drivers/mmc/host/mvsdio.c 2013-08-29 10:47:51.000000000 -0600
+++ b/drivers/mmc/host/mvsdio.c 2013-09-06 04:59:49.145163157 -0600
@@ -25,6 +25,7 @@
#include <linux/of_irq.h>
#include <linux/mmc/host.h>
@ -3477,7 +3483,7 @@ diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
diff -ruN a/include/linux/bubba3.h b/include/linux/bubba3.h
--- a/include/linux/bubba3.h 1969-12-31 17:00:00.000000000 -0700
+++ b/include/linux/bubba3.h 2013-08-27 02:33:26.683475583 -0600
+++ b/include/linux/bubba3.h 2013-09-06 04:59:49.155164153 -0600
@@ -0,0 +1,41 @@
+/*
+ * (C) Copyright 2010
@ -3522,7 +3528,7 @@ diff -ruN a/include/linux/bubba3.h b/include/linux/bubba3.h
+#endif
diff -ruN a/include/linux/nsa3xx-hwmon.h b/include/linux/nsa3xx-hwmon.h
--- a/include/linux/nsa3xx-hwmon.h 1969-12-31 17:00:00.000000000 -0700
+++ b/include/linux/nsa3xx-hwmon.h 2013-08-27 01:49:46.677375426 -0600
+++ b/include/linux/nsa3xx-hwmon.h 2013-09-06 04:59:49.155164153 -0600
@@ -0,0 +1,21 @@
+/*
+ * include/linux/nsa3xx.hwmon.h