archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-08 22:45:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/linux add dreamplug; core/linux-kirkwood to 3.11.2

Browse source
This commit is contained in:
moonman 2013-09-26 23:43:31 -06:00
parent 4934a34014
commit 5cdd27e85f
6 changed files with 236 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
core/linux-kirkwood/0001-block-Switch-from-BFQ-v6r2-for-3.10.0-to-BFQ-v6r2-fo.patch
View file

@ -1,59 +0,0 @@
From 994451c7668678f1bf3ec86345bef1c1d549ba45 Mon Sep 17 00:00:00 2001
From: Arianna Avanzini <avanzini.arianna@gmail.com>
Date: Wed, 24 Jul 2013 21:43:47 +0200
Subject: [PATCH] block: Switch from BFQ-v6r2 for 3.10.0 to BFQ-v6r2 for
3.10.8-rc1.
---
block/bfq-iosched.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index bc57923..bbe79fb 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -2930,14 +2930,22 @@ static void bfq_exit_queue(struct elevator_queue *e)
kfree(bfqd);
}
-static int bfq_init_queue(struct request_queue *q)
+static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)
{
struct bfq_group *bfqg;
struct bfq_data *bfqd;
+ struct elevator_queue *eq;
+
+ eq = elevator_alloc(q, e);
+ if (eq == NULL)
+ return -ENOMEM;
bfqd = kmalloc_node(sizeof(*bfqd), GFP_KERNEL | __GFP_ZERO, q->node);
- if (bfqd == NULL)
+ if (bfqd == NULL) {
+ kobject_put(&eq->kobj);
return -ENOMEM;
+ }
+ eq->elevator_data = bfqd;
/*
* Our fallback bfqq if bfq_find_alloc_queue() runs into OOM issues.
@@ -2948,11 +2956,15 @@ static int bfq_init_queue(struct request_queue *q)
atomic_inc(&bfqd->oom_bfqq.ref);
bfqd->queue = q;
- q->elevator->elevator_data = bfqd;
+
+ spin_lock_irq(q->queue_lock);
+ q->elevator = eq;
+ spin_unlock_irq(q->queue_lock);
bfqg = bfq_alloc_root_group(bfqd, q->node);
if (bfqg == NULL) {
kfree(bfqd);
+ kobject_put(&eq->kobj);
return -ENOMEM;
}
--
1.8.1.4

6
core/linux-kirkwood/PKGBUILD
View file

@ -7,9 +7,9 @@ pkgbase=linux-kirkwood
pkgname=('linux-kirkwood' 'linux-headers-kirkwood') pkgname=('linux-kirkwood' 'linux-headers-kirkwood')
#pkgname=linux-test # Build kernel with a different name #pkgname=linux-test # Build kernel with a different name
_kernelname=${pkgname#linux} _kernelname=${pkgname#linux}
_basekernel=3.11.1 _basekernel=3.11.2
pkgver=${_basekernel} pkgver=${_basekernel}
pkgrel=2 pkgrel=1
cryptover=1.6 cryptover=1.6
bfqver=v6r2 bfqver=v6r2
uksmver="0.1.2.2" uksmver="0.1.2.2"
@ -32,7 +32,7 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.xz"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-4).0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-4).patch" "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-4).0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-4).patch"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-4).0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-$(echo $_basekernel |cut -c 1-4).0.patch") "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-4).0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-$(echo $_basekernel |cut -c 1-4).0.patch")
md5sums=('466c042aa58d4839396443bf4438fdc5' md5sums=('7f6c73131f6307bcfdb7be0c6d530260'
'fc81175b156d9cce09cec61600de903b' 'fc81175b156d9cce09cec61600de903b'
'580f50d328b821d78d13bd3de7e75af4' '580f50d328b821d78d13bd3de7e75af4'
'SKIP' 'SKIP'

13
core/linux/PKGBUILD
View file

@ -10,9 +10,11 @@ pkgname=('linux' 'linux-headers')
_kernelname=${pkgname#linux} _kernelname=${pkgname#linux}
_basekernel=3.1 _basekernel=3.1
pkgver=${_basekernel}.10 pkgver=${_basekernel}.10
pkgrel=25 pkgrel=26
cryptover=1.6 cryptover=1.6
bfqver=v6r2 bfqver=v6r2
uksmver=0.1.2.2
arch=('arm') arch=('arm')
url="http://www.kernel.org/" url="http://www.kernel.org/"
license=('GPL2') license=('GPL2')
@ -31,6 +33,7 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2
'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php' 'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php'
'change-default-console-loglevel.patch' 'change-default-console-loglevel.patch'
'usb-add-reset-resume-quirk-for-several-webcams.patch' 'usb-add-reset-resume-quirk-for-several-webcams.patch'
"http://kerneldedup.org/download/uksm/${uksmver}/uksm-${uksmver}-for-v3.1.ge.10.patch"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${_basekernel}.0-${bfqver}/0001-block-prepare-I-O-context-code-for-BFQ-${bfqver}-for-${_basekernel}.0.patch" "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${_basekernel}.0-${bfqver}/0001-block-prepare-I-O-context-code-for-BFQ-${bfqver}-for-${_basekernel}.0.patch"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${_basekernel}.0-${bfqver}/0002-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${_basekernel}.patch" "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${_basekernel}.0-${bfqver}/0002-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${_basekernel}.patch"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${_basekernel}.0-${bfqver}/0003-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${_basekernel}.patch" "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${_basekernel}.0-${bfqver}/0003-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${_basekernel}.patch"
@ -39,17 +42,18 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2
md5sums=('8d43453f8159b2332ad410b19d86a931' md5sums=('8d43453f8159b2332ad410b19d86a931'
'a8e1c25a93a685ec2a1c3a808715fe9d' 'a8e1c25a93a685ec2a1c3a808715fe9d'
'60ba0d1767a3df9a19db9fcc70318c7c' '19cdfb42413fa8195885651b88ff2c55'
'61dbbcdb0f35032ea7f82c5b1ef7c769' '61dbbcdb0f35032ea7f82c5b1ef7c769'
'f5d3635da03cb45904bedd69b47133de' 'f5d3635da03cb45904bedd69b47133de'
'3f64ed9d71499fe9293dc671f4e4087e' '3f64ed9d71499fe9293dc671f4e4087e'
'29628745258df910abfb8cb24ca3ccd9' '29628745258df910abfb8cb24ca3ccd9'
'c9e6e8bb0774a89f7f9bd30a13be7532' 'c9e6e8bb0774a89f7f9bd30a13be7532'
'55b04499a4578e586cf5a4d0b69fc5aa' '55b04499a4578e586cf5a4d0b69fc5aa'
'528b4411a11c650fdfe7a0f64d9212a7' 'a37dea2e17ce565e3b3882f4a34bf27e'
'SKIP' 'SKIP'
'9d3c56a4b999c8bfbd4018089a62f662' '9d3c56a4b999c8bfbd4018089a62f662'
'd00814b57448895e65fbbc800e8a58ba' 'd00814b57448895e65fbbc800e8a58ba'
'19685c92623a8176fe3ed41d1ef8c5d9'
'4b94c49eef0a3eaa8b208662d34a73f0' '4b94c49eef0a3eaa8b208662d34a73f0'
'c194f165a59266e764683439a6068c66' 'c194f165a59266e764683439a6068c66'
'efeb99dd8ff6f619ecc0e399deef833e' 'efeb99dd8ff6f619ecc0e399deef833e'
@ -76,6 +80,9 @@ msg2 " requested additional support, mach-types"
patch -Np1 -i "${srcdir}/support.patch" patch -Np1 -i "${srcdir}/support.patch"
cp "${srcdir}/mach-types" arch/arm/tools cp "${srcdir}/mach-types" arch/arm/tools
msg2 "Add UKSM patch"
patch -Np1 -i "${srcdir}/uksm-${uksmver}-for-v3.1.ge.10.patch"
msg2 "Add BFQ I/O scheduler patches" msg2 "Add BFQ I/O scheduler patches"
patch -Np1 -i "${srcdir}/0001-block-prepare-I-O-context-code-for-BFQ-${bfqver}-for-${_basekernel}.0.patch" patch -Np1 -i "${srcdir}/0001-block-prepare-I-O-context-code-for-BFQ-${bfqver}-for-${_basekernel}.0.patch"
patch -Np1 -i "${srcdir}/0002-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${_basekernel}.patch" patch -Np1 -i "${srcdir}/0002-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${_basekernel}.patch"

283
core/linux/archlinuxarm.patch
View file

@ -1,6 +1,6 @@
diff -ruN a/arch/arm/mach-kirkwood/bubba3-gpio.c b/arch/arm/mach-kirkwood/bubba3-gpio.c 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 --- 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-09-05 23:15:42.844239887 -0600 +++ b/arch/arm/mach-kirkwood/bubba3-gpio.c 2013-09-16 01:27:45.727771513 -0600
@@ -0,0 +1,391 @@ @@ -0,0 +1,391 @@
+/* +/*
+ * Excito BUBBA|3 led driver. + * Excito BUBBA|3 led driver.
@ -395,7 +395,7 @@ diff -ruN a/arch/arm/mach-kirkwood/bubba3-gpio.c b/arch/arm/mach-kirkwood/bubba3
+module_exit(bubba3_cleanup); +module_exit(bubba3_cleanup);
diff -ruN a/arch/arm/mach-kirkwood/bubba3-setup.c b/arch/arm/mach-kirkwood/bubba3-setup.c 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 --- 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-09-05 23:13:23.816849058 -0600 +++ b/arch/arm/mach-kirkwood/bubba3-setup.c 2013-09-16 01:27:45.727771513 -0600
@@ -0,0 +1,232 @@ @@ -0,0 +1,232 @@
+/* +/*
+ * arch/arm/mach-kirkwood/bubba3-setup.c + * arch/arm/mach-kirkwood/bubba3-setup.c
@ -631,7 +631,7 @@ diff -ruN a/arch/arm/mach-kirkwood/bubba3-setup.c b/arch/arm/mach-kirkwood/bubba
+MACHINE_END +MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c 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 2011-10-24 01:10:05.000000000 -0600 --- a/arch/arm/mach-kirkwood/dockstar-setup.c 2011-10-24 01:10:05.000000000 -0600
+++ b/arch/arm/mach-kirkwood/dockstar-setup.c 2013-09-05 23:13:23.826848876 -0600 +++ b/arch/arm/mach-kirkwood/dockstar-setup.c 2013-09-16 01:27:45.737771377 -0600
@@ -19,7 +19,6 @@ @@ -19,7 +19,6 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
@ -685,7 +685,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 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 --- 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-09-05 23:13:23.826848876 -0600 +++ b/arch/arm/mach-kirkwood/goflexhome-setup.c 2013-09-16 01:27:45.747771289 -0600
@@ -0,0 +1,123 @@ @@ -0,0 +1,123 @@
+/* +/*
+ * arch/arm/mach-kirkwood/goflexhome-setup.c + * arch/arm/mach-kirkwood/goflexhome-setup.c
@ -812,7 +812,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 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 --- 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-09-05 23:13:23.826848876 -0600 +++ b/arch/arm/mach-kirkwood/goflexnet-setup.c 2013-09-16 01:27:45.747771289 -0600
@@ -0,0 +1,176 @@ @@ -0,0 +1,176 @@
+/* +/*
+ * arch/arm/mach-kirkwood/goflexnet-setup.c + * arch/arm/mach-kirkwood/goflexnet-setup.c
@ -992,8 +992,54 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/go
+ +
diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c 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 2011-10-24 01:10:05.000000000 -0600 --- a/arch/arm/mach-kirkwood/guruplug-setup.c 2011-10-24 01:10:05.000000000 -0600
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c 2013-09-05 23:13:23.826848876 -0600 +++ b/arch/arm/mach-kirkwood/guruplug-setup.c 2013-09-16 01:49:14.268518934 -0600
@@ -57,22 +57,24 @@ @@ -16,6 +16,8 @@
#include <linux/mv643xx_eth.h>
#include <linux/gpio.h>
#include <linux/leds.h>
+#include <linux/spi/flash.h>
+#include <linux/spi/spi.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/kirkwood.h>
@@ -23,6 +25,36 @@
#include "common.h"
#include "mpp.h"
+static struct mtd_partition dreamplug_partitions[] = {
+ {
+ .name = "u-boot",
+ .size = SZ_512K,
+ .offset = 0,
+ }, {
+ .name = "u-boot env",
+ .size = SZ_64K,
+ .offset = SZ_512K + SZ_512K,
+ },
+};
+
+static const struct flash_platform_data dreamplug_spi_slave_data = {
+ .type = "mx25l1606e",
+ .name = "spi_flash",
+ .parts = dreamplug_partitions,
+ .nr_parts = ARRAY_SIZE(dreamplug_partitions),
+};
+
+static struct spi_board_info __initdata dreamplug_spi_slave_info[] = {
+ {
+ .modalias = "m25p80",
+ .platform_data = &dreamplug_spi_slave_data,
+ .irq = -1,
+ .max_speed_hz = 50000000,
+ .bus_num = 0,
+ .chip_select = 0,
+ },
+};
+
static struct mtd_partition guruplug_nand_parts[] = {
{
.name = "u-boot",
@@ -57,22 +89,24 @@
static struct gpio_led guruplug_led_pins[] = { static struct gpio_led guruplug_led_pins[] = {
{ {
@ -1022,9 +1068,101 @@ diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/gur
.gpio = 49, .gpio = 49,
.active_low = 1, .active_low = 1,
}, },
@@ -91,6 +125,41 @@
}
};
+static struct gpio_led dreamplug_led_pins[] = {
+ {
+ .name = "status:blue:bt",
+ .gpio = 47,
+ .active_low = 1,
+ },
+ {
+ .name = "status:green:wifi",
+ .gpio = 48,
+ .active_low = 1,
+ },
+ {
+ .name = "status:blue:ap",
+ .gpio = 49,
+ .active_low = 1,
+ },
+};
+
+static struct gpio_led_platform_data dreamplug_led_data = {
+ .leds = dreamplug_led_pins,
+ .num_leds = ARRAY_SIZE(dreamplug_led_pins),
+};
+
+static unsigned int dreamplug_mpp_config[] __initdata = {
+ MPP0_SPI_SCn,
+ MPP1_SPI_MOSI,
+ MPP2_SPI_SCK,
+ MPP3_SPI_MISO,
+ MPP47_GPIO, /* Bluetooth LED */
+ MPP48_GPIO, /* Wifi LED */
+ MPP49_GPIO, /* Wifi AP LED */
+ 0
+};
+
+
static unsigned int guruplug_mpp_config[] __initdata = {
MPP46_GPIO, /* M_RLED */
MPP47_GPIO, /* M_GLED */
@@ -105,10 +174,21 @@
* Basic setup. Needs to be called early.
*/
kirkwood_init();
- kirkwood_mpp_conf(guruplug_mpp_config);
- kirkwood_uart0_init();
- kirkwood_nand_init(ARRAY_AND_SIZE(guruplug_nand_parts), 25);
+ if (machine_is_guruplug()) {
+ kirkwood_mpp_conf(guruplug_mpp_config);
+ kirkwood_uart0_init();
+ kirkwood_nand_init(ARRAY_AND_SIZE(guruplug_nand_parts), 25);
+ }
+
+ if (machine_is_dreamplug()) {
+ kirkwood_mpp_conf(dreamplug_mpp_config);
+ kirkwood_uart0_init();
+ spi_register_board_info(dreamplug_spi_slave_info,
+ ARRAY_SIZE(dreamplug_spi_slave_info));
+ kirkwood_spi_init();
+ guruplug_leds.dev.platform_data = &dreamplug_led_data;
+ }
kirkwood_ehci_init();
kirkwood_ge00_init(&guruplug_ge00_data);
@@ -119,6 +199,7 @@
platform_device_register(&guruplug_leds);
}
+#ifdef CONFIG_MACH_GURUPLUG
MACHINE_START(GURUPLUG, "Marvell GuruPlug Reference Board")
/* Maintainer: Siddarth Gore <gores@marvell.com> */
.boot_params = 0x00000100,
@@ -128,3 +209,16 @@
.init_irq = kirkwood_init_irq,
.timer = &kirkwood_timer,
MACHINE_END
+#endif
+
+#ifdef CONFIG_MACH_DREAMPLUG
+MACHINE_START(DREAMPLUG, "Marvell DreamPlug Reference Board")
+ /* Maintainer: ? */
+ .boot_params = 0x00000100,
+ .init_machine = guruplug_init,
+ .map_io = kirkwood_map_io,
+ .init_early = kirkwood_init_early,
+ .init_irq = kirkwood_init_irq,
+ .timer = &kirkwood_timer,
+MACHINE_END
+#endif
diff -ruN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/iconnect-setup.c 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 --- 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-09-05 23:13:23.836848691 -0600 +++ b/arch/arm/mach-kirkwood/iconnect-setup.c 2013-09-16 01:27:45.747771289 -0600
@@ -0,0 +1,203 @@ @@ -0,0 +1,203 @@
+/* +/*
+ * arch/arm/mach-kirkwood/iconnect-setup.c + * arch/arm/mach-kirkwood/iconnect-setup.c
@ -1231,7 +1369,7 @@ diff -ruN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/ico
+MACHINE_END +MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwood/ionics-stratus-setup.c 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 --- 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-09-05 23:13:23.836848691 -0600 +++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c 2013-09-16 01:27:45.747771289 -0600
@@ -0,0 +1,136 @@ @@ -0,0 +1,136 @@
+/* +/*
+ * arch/arm/mach-kirkwood/ionics-stratus-setup.c + * arch/arm/mach-kirkwood/ionics-stratus-setup.c
@ -1371,8 +1509,21 @@ diff -ruN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwo
+MACHINE_END +MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
--- a/arch/arm/mach-kirkwood/Kconfig 2011-10-24 01:10:05.000000000 -0600 --- a/arch/arm/mach-kirkwood/Kconfig 2011-10-24 01:10:05.000000000 -0600
+++ b/arch/arm/mach-kirkwood/Kconfig 2013-09-05 23:13:23.836848691 -0600 +++ b/arch/arm/mach-kirkwood/Kconfig 2013-09-16 01:51:17.386658229 -0600
@@ -64,6 +64,54 @@ @@ -44,6 +44,12 @@
Say 'Y' here if you want your kernel to support the
Marvell GuruPlug Reference Board.
+config MACH_DREAMPLUG
+ bool "Marvell DreamPlug Reference Board"
+ help
+ Say 'Y' here if you want your kernel to support the
+ Marvell DreamPlug Reference Board.
+
config MACH_TS219
bool "QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and TS-219P+ Turbo NAS"
help
@@ -64,6 +70,54 @@
Say 'Y' here if you want your kernel to support the Say 'Y' here if you want your kernel to support the
Seagate FreeAgent DockStar. Seagate FreeAgent DockStar.
@ -1427,7 +1578,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
config MACH_OPENRD config MACH_OPENRD
bool bool
@@ -88,6 +136,12 @@ @@ -88,6 +142,12 @@
Say 'Y' here if you want your kernel to support the Say 'Y' here if you want your kernel to support the
Marvell OpenRD Ultimate Board. Marvell OpenRD Ultimate Board.
@ -1440,7 +1591,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
config MACH_NETSPACE_V2 config MACH_NETSPACE_V2
bool "LaCie Network Space v2 NAS Board" bool "LaCie Network Space v2 NAS Board"
help help
@@ -130,6 +184,18 @@ @@ -130,6 +190,18 @@
Say 'Y' here if you want your kernel to support the Say 'Y' here if you want your kernel to support the
HP t5325 Thin Client. HP t5325 Thin Client.
@ -1461,10 +1612,12 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
endif endif
diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
--- a/arch/arm/mach-kirkwood/Makefile 2011-10-24 01:10:05.000000000 -0600 --- a/arch/arm/mach-kirkwood/Makefile 2011-10-24 01:10:05.000000000 -0600
+++ b/arch/arm/mach-kirkwood/Makefile 2013-09-05 23:13:23.836848691 -0600 +++ b/arch/arm/mach-kirkwood/Makefile 2013-09-16 01:52:10.805849910 -0600
@@ -8,6 +8,14 @@ @@ -7,7 +7,16 @@
obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o
obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o
obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o
+obj-$(CONFIG_MACH_DREAMPLUG) += guruplug-setup.o
obj-$(CONFIG_MACH_DOCKSTAR) += dockstar-setup.o obj-$(CONFIG_MACH_DOCKSTAR) += dockstar-setup.o
+obj-$(CONFIG_MACH_GOFLEXNET) += goflexnet-setup.o +obj-$(CONFIG_MACH_GOFLEXNET) += goflexnet-setup.o
+obj-$(CONFIG_MACH_GOFLEXHOME) += goflexhome-setup.o +obj-$(CONFIG_MACH_GOFLEXHOME) += goflexhome-setup.o
@ -1477,7 +1630,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o
obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o
obj-$(CONFIG_MACH_OPENRD) += openrd-setup.o obj-$(CONFIG_MACH_OPENRD) += openrd-setup.o
@@ -17,6 +25,9 @@ @@ -17,6 +26,9 @@
obj-$(CONFIG_MACH_D2NET_V2) += d2net_v2-setup.o lacie_v2-common.o obj-$(CONFIG_MACH_D2NET_V2) += d2net_v2-setup.o lacie_v2-common.o
obj-$(CONFIG_MACH_NET2BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o obj-$(CONFIG_MACH_NET2BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o
obj-$(CONFIG_MACH_NET5BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o obj-$(CONFIG_MACH_NET5BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o
@ -1489,7 +1642,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
obj-$(CONFIG_CPU_IDLE) += cpuidle.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o
diff -ruN a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h diff -ruN a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h
--- a/arch/arm/mach-kirkwood/mpp.h 2011-10-24 01:10:05.000000000 -0600 --- a/arch/arm/mach-kirkwood/mpp.h 2011-10-24 01:10:05.000000000 -0600
+++ b/arch/arm/mach-kirkwood/mpp.h 2013-09-05 23:13:23.836848691 -0600 +++ b/arch/arm/mach-kirkwood/mpp.h 2013-09-16 01:27:45.757771220 -0600
@@ -102,6 +102,7 @@ @@ -102,6 +102,7 @@
#define MPP11_SATA0_ACTn MPP( 11, 0x5, 0, 1, 0, 1, 1, 1, 1 ) #define MPP11_SATA0_ACTn MPP( 11, 0x5, 0, 1, 0, 1, 1, 1, 1 )
@ -1500,7 +1653,7 @@ diff -ruN a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h
#define MPP12_SPI_MOSI MPP( 12, 0xb, 0, 1, 0, 0, 0, 0, 1 ) #define MPP12_SPI_MOSI MPP( 12, 0xb, 0, 1, 0, 0, 0, 0, 1 )
diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6210-setup.c 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 --- 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-09-05 23:13:23.846848501 -0600 +++ b/arch/arm/mach-kirkwood/nas6210-setup.c 2013-09-16 01:27:45.767771111 -0600
@@ -0,0 +1,185 @@ @@ -0,0 +1,185 @@
+/* +/*
+ * arch/arm/mach-kirkwood/nas6210-setup.c + * arch/arm/mach-kirkwood/nas6210-setup.c
@ -1689,7 +1842,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6
+MACHINE_END +MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa310-setup.c 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 --- 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-09-05 23:13:23.846848501 -0600 +++ b/arch/arm/mach-kirkwood/nsa310-setup.c 2013-09-16 01:27:45.767771111 -0600
@@ -0,0 +1,357 @@ @@ -0,0 +1,357 @@
+/* +/*
+ * arch/arm/mach-kirkwood/nsa310-setup.c + * arch/arm/mach-kirkwood/nsa310-setup.c
@ -2050,7 +2203,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa31
+MACHINE_END +MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa320-setup.c 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 --- 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-09-05 23:13:23.846848501 -0600 +++ b/arch/arm/mach-kirkwood/nsa320-setup.c 2013-09-16 01:27:45.767771111 -0600
@@ -0,0 +1,308 @@ @@ -0,0 +1,308 @@
+/* +/*
+ * arch/arm/mach-kirkwood/nsa320-setup.c + * arch/arm/mach-kirkwood/nsa320-setup.c
@ -2362,7 +2515,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa32
+MACHINE_END +MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pogo_e02-setup.c 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 --- 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-09-05 23:13:23.856848310 -0600 +++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c 2013-09-16 01:27:45.767771111 -0600
@@ -0,0 +1,114 @@ @@ -0,0 +1,114 @@
+/* +/*
+ * arch/arm/mach-kirkwood/pogo_e02-setup.c + * arch/arm/mach-kirkwood/pogo_e02-setup.c
@ -2480,7 +2633,7 @@ diff -ruN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pog
+MACHINE_END +MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/pogoplugv4-setup.c 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 --- 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-09-05 23:13:23.856848310 -0600 +++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c 2013-09-16 01:27:45.777770983 -0600
@@ -0,0 +1,194 @@ @@ -0,0 +1,194 @@
+/* +/*
+ * arch/arm/mach-kirkwood/pogoplugv4-setup.c + * arch/arm/mach-kirkwood/pogoplugv4-setup.c
@ -2678,7 +2831,7 @@ diff -ruN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/p
+MACHINE_END +MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c 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 2011-10-24 01:10:05.000000000 -0600 --- a/arch/arm/mach-kirkwood/sheevaplug-setup.c 2011-10-24 01:10:05.000000000 -0600
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c 2013-09-05 23:13:23.856848310 -0600 +++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c 2013-09-16 01:27:45.777770983 -0600
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
.phy_addr = MV643XX_ETH_PHY_ADDR(0), .phy_addr = MV643XX_ETH_PHY_ADDR(0),
}; };
@ -2764,7 +2917,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 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 --- 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-09-05 23:13:23.856848310 -0600 +++ b/arch/arm/mach-kirkwood/topkick-setup.c 2013-09-16 01:27:45.777770983 -0600
@@ -0,0 +1,164 @@ @@ -0,0 +1,164 @@
+/* +/*
+ * arch/arm/mach-kirkwood/topkick-setup.c + * arch/arm/mach-kirkwood/topkick-setup.c
@ -2932,7 +3085,7 @@ diff -ruN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topk
+MACHINE_END +MACHINE_END
diff -ruN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c diff -ruN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
--- a/arch/arm/plat-orion/common.c 2011-10-24 01:10:05.000000000 -0600 --- a/arch/arm/plat-orion/common.c 2011-10-24 01:10:05.000000000 -0600
+++ b/arch/arm/plat-orion/common.c 2013-09-05 23:13:23.876847928 -0600 +++ b/arch/arm/plat-orion/common.c 2013-09-16 01:27:45.787770841 -0600
@@ -223,7 +223,9 @@ @@ -223,7 +223,9 @@
/***************************************************************************** /*****************************************************************************
* GE00 * GE00
@ -2946,7 +3099,7 @@ diff -ruN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
{ {
diff -ruN a/.config b/.config diff -ruN a/.config b/.config
--- a/.config 1969-12-31 17:00:00.000000000 -0700 --- a/.config 1969-12-31 17:00:00.000000000 -0700
+++ b/.config 2013-09-05 23:13:23.896847552 -0600 +++ b/.config 2013-09-16 01:27:45.817770421 -0600
@@ -0,0 +1,3901 @@ @@ -0,0 +1,3901 @@
+# +#
+# Automatically generated file; DO NOT EDIT. +# Automatically generated file; DO NOT EDIT.
@ -6851,7 +7004,7 @@ diff -ruN a/.config b/.config
+# CONFIG_CORDIC is not set +# CONFIG_CORDIC is not set
diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
--- a/drivers/hwmon/Kconfig 2011-10-24 01:10:05.000000000 -0600 --- a/drivers/hwmon/Kconfig 2011-10-24 01:10:05.000000000 -0600
+++ b/drivers/hwmon/Kconfig 2013-09-05 23:13:23.916847176 -0600 +++ b/drivers/hwmon/Kconfig 2013-09-16 01:27:45.827770295 -0600
@@ -1327,6 +1327,19 @@ @@ -1327,6 +1327,19 @@
help help
Support for the A/D converter on MC13783 PMIC. Support for the A/D converter on MC13783 PMIC.
@ -6874,7 +7027,7 @@ diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
comment "ACPI drivers" comment "ACPI drivers"
diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
--- a/drivers/hwmon/Makefile 2011-10-24 01:10:05.000000000 -0600 --- a/drivers/hwmon/Makefile 2011-10-24 01:10:05.000000000 -0600
+++ b/drivers/hwmon/Makefile 2013-09-05 23:13:23.926846988 -0600 +++ b/drivers/hwmon/Makefile 2013-09-16 01:27:45.837770178 -0600
@@ -93,6 +93,7 @@ @@ -93,6 +93,7 @@
obj-$(CONFIG_SENSORS_MAX6642) += max6642.o obj-$(CONFIG_SENSORS_MAX6642) += max6642.o
obj-$(CONFIG_SENSORS_MAX6650) += max6650.o obj-$(CONFIG_SENSORS_MAX6650) += max6650.o
@ -6885,7 +7038,7 @@ diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
obj-$(CONFIG_SENSORS_PC87427) += pc87427.o obj-$(CONFIG_SENSORS_PC87427) += pc87427.o
diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c 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 --- a/drivers/hwmon/nsa3xx-hwmon.c 1969-12-31 17:00:00.000000000 -0700
+++ b/drivers/hwmon/nsa3xx-hwmon.c 2013-09-05 23:13:23.926846988 -0600 +++ b/drivers/hwmon/nsa3xx-hwmon.c 2013-09-16 01:27:45.837770178 -0600
@@ -0,0 +1,251 @@ @@ -0,0 +1,251 @@
+/* +/*
+ * drivers/hwmon/nsa3xx-hwmon.c + * drivers/hwmon/nsa3xx-hwmon.c
@ -7140,7 +7293,7 @@ diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
+MODULE_ALIAS("platform:nsa3xx-hwmon"); +MODULE_ALIAS("platform:nsa3xx-hwmon");
diff -ruN a/drivers/leds/Kconfig b/drivers/leds/Kconfig diff -ruN a/drivers/leds/Kconfig b/drivers/leds/Kconfig
--- a/drivers/leds/Kconfig 2011-10-24 01:10:05.000000000 -0600 --- a/drivers/leds/Kconfig 2011-10-24 01:10:05.000000000 -0600
+++ b/drivers/leds/Kconfig 2013-09-05 23:13:23.936846799 -0600 +++ b/drivers/leds/Kconfig 2013-09-16 01:27:45.847770057 -0600
@@ -406,7 +406,6 @@ @@ -406,7 +406,6 @@
config LEDS_TRIGGER_IDE_DISK config LEDS_TRIGGER_IDE_DISK
@ -7150,8 +7303,8 @@ diff -ruN a/drivers/leds/Kconfig b/drivers/leds/Kconfig
help help
This allows LEDs to be controlled by IDE disk activity. This allows LEDs to be controlled by IDE disk activity.
diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
--- a/drivers/mmc/core/core.c 2013-09-05 23:11:56.218499050 -0600 --- a/drivers/mmc/core/core.c 2013-09-16 01:25:16.699675815 -0600
+++ b/drivers/mmc/core/core.c 2013-09-05 23:13:23.946846611 -0600 +++ b/drivers/mmc/core/core.c 2013-09-16 01:27:45.867769801 -0600
@@ -399,9 +399,9 @@ @@ -399,9 +399,9 @@
* The limit is really 250 ms, but that is * The limit is really 250 ms, but that is
* insufficient for some crappy cards. * insufficient for some crappy cards.
@ -7165,8 +7318,8 @@ diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
/* /*
* SDHC cards always use these fixed values. * SDHC cards always use these fixed values.
diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
--- a/drivers/mmc/core/sd.c 2013-09-05 23:11:56.218499050 -0600 --- a/drivers/mmc/core/sd.c 2013-09-16 01:25:16.709675688 -0600
+++ b/drivers/mmc/core/sd.c 2013-09-05 23:13:23.956846422 -0600 +++ b/drivers/mmc/core/sd.c 2013-09-16 01:27:45.867769801 -0600
@@ -388,6 +388,15 @@ @@ -388,6 +388,15 @@
return -ENOMEM; return -ENOMEM;
} }
@ -7185,7 +7338,7 @@ diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
goto out; goto out;
diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
--- a/drivers/mmc/host/mvsdio.c 2011-10-24 01:10:05.000000000 -0600 --- a/drivers/mmc/host/mvsdio.c 2011-10-24 01:10:05.000000000 -0600
+++ b/drivers/mmc/host/mvsdio.c 2013-09-05 23:13:23.956846422 -0600 +++ b/drivers/mmc/host/mvsdio.c 2013-09-16 01:27:45.867769801 -0600
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/gpio.h> #include <linux/gpio.h>
@ -7204,7 +7357,7 @@ diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
diff -ruN a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig diff -ruN a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
--- a/drivers/net/wireless/Kconfig 2011-10-24 01:10:05.000000000 -0600 --- a/drivers/net/wireless/Kconfig 2011-10-24 01:10:05.000000000 -0600
+++ b/drivers/net/wireless/Kconfig 2013-09-05 23:13:23.976846046 -0600 +++ b/drivers/net/wireless/Kconfig 2013-09-16 01:27:45.887769541 -0600
@@ -51,6 +51,12 @@ @@ -51,6 +51,12 @@
---help--- ---help---
A driver for Marvell Libertas 8388 USB devices using thinfirm. A driver for Marvell Libertas 8388 USB devices using thinfirm.
@ -7220,7 +7373,7 @@ diff -ruN a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
depends on ISA_DMA_API && (PCI || BROKEN) depends on ISA_DMA_API && (PCI || BROKEN)
diff -ruN a/drivers/net/wireless/libertas/Kconfig b/drivers/net/wireless/libertas/Kconfig diff -ruN a/drivers/net/wireless/libertas/Kconfig b/drivers/net/wireless/libertas/Kconfig
--- a/drivers/net/wireless/libertas/Kconfig 2011-10-24 01:10:05.000000000 -0600 --- a/drivers/net/wireless/libertas/Kconfig 2011-10-24 01:10:05.000000000 -0600
+++ b/drivers/net/wireless/libertas/Kconfig 2013-09-05 23:13:23.976846046 -0600 +++ b/drivers/net/wireless/libertas/Kconfig 2013-09-16 01:27:45.887769541 -0600
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
depends on CFG80211 depends on CFG80211
select WIRELESS_EXT select WIRELESS_EXT
@ -7231,7 +7384,7 @@ diff -ruN a/drivers/net/wireless/libertas/Kconfig b/drivers/net/wireless/liberta
---help--- ---help---
diff -ruN a/drivers/net/wireless/libertas_uap/Makefile b/drivers/net/wireless/libertas_uap/Makefile diff -ruN a/drivers/net/wireless/libertas_uap/Makefile b/drivers/net/wireless/libertas_uap/Makefile
--- a/drivers/net/wireless/libertas_uap/Makefile 1969-12-31 17:00:00.000000000 -0700 --- a/drivers/net/wireless/libertas_uap/Makefile 1969-12-31 17:00:00.000000000 -0700
+++ b/drivers/net/wireless/libertas_uap/Makefile 2013-09-05 23:13:23.986845857 -0600 +++ b/drivers/net/wireless/libertas_uap/Makefile 2013-09-16 01:27:45.887769541 -0600
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
+obj-$(CONFIG_LIBERTAS_UAP) += uap8xxx.o +obj-$(CONFIG_LIBERTAS_UAP) += uap8xxx.o
+ +
@ -7241,7 +7394,7 @@ diff -ruN a/drivers/net/wireless/libertas_uap/Makefile b/drivers/net/wireless/li
+EXTRA_CFLAGS += -DFPNUM='"52"' -DPXA3XX_DMA_ALIGN -DDEBUG_LEVEL1 +EXTRA_CFLAGS += -DFPNUM='"52"' -DPXA3XX_DMA_ALIGN -DDEBUG_LEVEL1
diff -ruN a/drivers/net/wireless/libertas_uap/uap_debug.c b/drivers/net/wireless/libertas_uap/uap_debug.c diff -ruN a/drivers/net/wireless/libertas_uap/uap_debug.c b/drivers/net/wireless/libertas_uap/uap_debug.c
--- a/drivers/net/wireless/libertas_uap/uap_debug.c 1969-12-31 17:00:00.000000000 -0700 --- a/drivers/net/wireless/libertas_uap/uap_debug.c 1969-12-31 17:00:00.000000000 -0700
+++ b/drivers/net/wireless/libertas_uap/uap_debug.c 2013-09-05 23:13:23.986845857 -0600 +++ b/drivers/net/wireless/libertas_uap/uap_debug.c 2013-09-16 01:27:45.897769412 -0600
@@ -0,0 +1,261 @@ @@ -0,0 +1,261 @@
+/** @file uap_debug.c +/** @file uap_debug.c
+ * @brief This file contains functions for debug proc file. + * @brief This file contains functions for debug proc file.
@ -7506,7 +7659,7 @@ diff -ruN a/drivers/net/wireless/libertas_uap/uap_debug.c b/drivers/net/wireless
+#endif +#endif
diff -ruN a/drivers/net/wireless/libertas_uap/uap_drv.h b/drivers/net/wireless/libertas_uap/uap_drv.h diff -ruN a/drivers/net/wireless/libertas_uap/uap_drv.h b/drivers/net/wireless/libertas_uap/uap_drv.h
--- a/drivers/net/wireless/libertas_uap/uap_drv.h 1969-12-31 17:00:00.000000000 -0700 --- a/drivers/net/wireless/libertas_uap/uap_drv.h 1969-12-31 17:00:00.000000000 -0700
+++ b/drivers/net/wireless/libertas_uap/uap_drv.h 2013-09-05 23:13:23.986845857 -0600 +++ b/drivers/net/wireless/libertas_uap/uap_drv.h 2013-09-16 01:27:45.897769412 -0600
@@ -0,0 +1,667 @@ @@ -0,0 +1,667 @@
+/** @file uap_drv.h +/** @file uap_drv.h
+ * @brief This file contains Linux OS related definitions and + * @brief This file contains Linux OS related definitions and
@ -8177,7 +8330,7 @@ diff -ruN a/drivers/net/wireless/libertas_uap/uap_drv.h b/drivers/net/wireless/l
+#endif /* _UAP_DRV_H */ +#endif /* _UAP_DRV_H */
diff -ruN a/drivers/net/wireless/libertas_uap/uap_fw.h b/drivers/net/wireless/libertas_uap/uap_fw.h diff -ruN a/drivers/net/wireless/libertas_uap/uap_fw.h b/drivers/net/wireless/libertas_uap/uap_fw.h
--- a/drivers/net/wireless/libertas_uap/uap_fw.h 1969-12-31 17:00:00.000000000 -0700 --- a/drivers/net/wireless/libertas_uap/uap_fw.h 1969-12-31 17:00:00.000000000 -0700
+++ b/drivers/net/wireless/libertas_uap/uap_fw.h 2013-09-05 23:13:23.996845669 -0600 +++ b/drivers/net/wireless/libertas_uap/uap_fw.h 2013-09-16 01:27:45.907769283 -0600
@@ -0,0 +1,359 @@ @@ -0,0 +1,359 @@
+/** @file uap_fw.h +/** @file uap_fw.h
+ * + *
@ -8540,7 +8693,7 @@ diff -ruN a/drivers/net/wireless/libertas_uap/uap_fw.h b/drivers/net/wireless/li
+#endif /* _UAP_FW_H */ +#endif /* _UAP_FW_H */
diff -ruN a/drivers/net/wireless/libertas_uap/uap_headers.h b/drivers/net/wireless/libertas_uap/uap_headers.h diff -ruN a/drivers/net/wireless/libertas_uap/uap_headers.h b/drivers/net/wireless/libertas_uap/uap_headers.h
--- a/drivers/net/wireless/libertas_uap/uap_headers.h 1969-12-31 17:00:00.000000000 -0700 --- a/drivers/net/wireless/libertas_uap/uap_headers.h 1969-12-31 17:00:00.000000000 -0700
+++ b/drivers/net/wireless/libertas_uap/uap_headers.h 2013-09-05 23:13:23.996845669 -0600 +++ b/drivers/net/wireless/libertas_uap/uap_headers.h 2013-09-16 01:27:45.907769283 -0600
@@ -0,0 +1,64 @@ @@ -0,0 +1,64 @@
+/** @file uap_headers.h +/** @file uap_headers.h
+ * + *
@ -8608,7 +8761,7 @@ diff -ruN a/drivers/net/wireless/libertas_uap/uap_headers.h b/drivers/net/wirele
+#endif /* _UAP_HEADERS_H */ +#endif /* _UAP_HEADERS_H */
diff -ruN a/drivers/net/wireless/libertas_uap/uap_main.c b/drivers/net/wireless/libertas_uap/uap_main.c diff -ruN a/drivers/net/wireless/libertas_uap/uap_main.c b/drivers/net/wireless/libertas_uap/uap_main.c
--- a/drivers/net/wireless/libertas_uap/uap_main.c 1969-12-31 17:00:00.000000000 -0700 --- a/drivers/net/wireless/libertas_uap/uap_main.c 1969-12-31 17:00:00.000000000 -0700
+++ b/drivers/net/wireless/libertas_uap/uap_main.c 2013-09-05 23:13:24.016845292 -0600 +++ b/drivers/net/wireless/libertas_uap/uap_main.c 2013-09-16 01:27:45.917769156 -0600
@@ -0,0 +1,1830 @@ @@ -0,0 +1,1830 @@
+/** @file uap_main.c +/** @file uap_main.c
+ * @brief This file contains the major functions in uAP + * @brief This file contains the major functions in uAP
@ -10442,7 +10595,7 @@ diff -ruN a/drivers/net/wireless/libertas_uap/uap_main.c b/drivers/net/wireless/
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
diff -ruN a/drivers/net/wireless/libertas_uap/uap_proc.c b/drivers/net/wireless/libertas_uap/uap_proc.c diff -ruN a/drivers/net/wireless/libertas_uap/uap_proc.c b/drivers/net/wireless/libertas_uap/uap_proc.c
--- a/drivers/net/wireless/libertas_uap/uap_proc.c 1969-12-31 17:00:00.000000000 -0700 --- a/drivers/net/wireless/libertas_uap/uap_proc.c 1969-12-31 17:00:00.000000000 -0700
+++ b/drivers/net/wireless/libertas_uap/uap_proc.c 2013-09-05 23:13:24.016845292 -0600 +++ b/drivers/net/wireless/libertas_uap/uap_proc.c 2013-09-16 01:27:45.927769030 -0600
@@ -0,0 +1,296 @@ @@ -0,0 +1,296 @@
+/** @file uap_proc.c +/** @file uap_proc.c
+ * @brief This file contains functions for proc file. + * @brief This file contains functions for proc file.
@ -10742,7 +10895,7 @@ diff -ruN a/drivers/net/wireless/libertas_uap/uap_proc.c b/drivers/net/wireless/
+#endif +#endif
diff -ruN a/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c b/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c diff -ruN a/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c b/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c
--- a/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c 1969-12-31 17:00:00.000000000 -0700 --- a/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c 1969-12-31 17:00:00.000000000 -0700
+++ b/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c 2013-09-05 23:13:24.026845104 -0600 +++ b/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c 2013-09-16 01:27:45.937768903 -0600
@@ -0,0 +1,1428 @@ @@ -0,0 +1,1428 @@
+/** @file uap_sdio_mmc.c +/** @file uap_sdio_mmc.c
+ * @brief This file contains SDIO IF (interface) module + * @brief This file contains SDIO IF (interface) module
@ -12174,7 +12327,7 @@ diff -ruN a/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c b/drivers/net/wirel
+} +}
diff -ruN a/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h b/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h diff -ruN a/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h b/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h
--- a/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h 1969-12-31 17:00:00.000000000 -0700 --- a/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h 1969-12-31 17:00:00.000000000 -0700
+++ b/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h 2013-09-05 23:13:24.026845104 -0600 +++ b/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h 2013-09-16 01:27:45.937768903 -0600
@@ -0,0 +1,136 @@ @@ -0,0 +1,136 @@
+/** @file uap_sdio_mmc.h +/** @file uap_sdio_mmc.h
+ * @brief This file contains SDIO IF (interface) module + * @brief This file contains SDIO IF (interface) module
@ -12314,7 +12467,7 @@ diff -ruN a/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h b/drivers/net/wirel
+#endif /* _UAP_SDIO_MMC_H */ +#endif /* _UAP_SDIO_MMC_H */
diff -ruN a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile diff -ruN a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
--- a/drivers/net/wireless/Makefile 2011-10-24 01:10:05.000000000 -0600 --- a/drivers/net/wireless/Makefile 2011-10-24 01:10:05.000000000 -0600
+++ b/drivers/net/wireless/Makefile 2013-09-05 23:13:24.026845104 -0600 +++ b/drivers/net/wireless/Makefile 2013-09-16 01:27:45.967768519 -0600
@@ -37,6 +37,8 @@ @@ -37,6 +37,8 @@
obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/ obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/
@ -12326,7 +12479,7 @@ diff -ruN a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
obj-$(CONFIG_MWL8K) += mwl8k.o obj-$(CONFIG_MWL8K) += mwl8k.o
diff -ruN a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c diff -ruN a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
--- a/drivers/net/wireless/mwifiex/sdio.c 2011-10-24 01:10:05.000000000 -0600 --- a/drivers/net/wireless/mwifiex/sdio.c 2011-10-24 01:10:05.000000000 -0600
+++ b/drivers/net/wireless/mwifiex/sdio.c 2013-09-05 23:13:24.046844727 -0600 +++ b/drivers/net/wireless/mwifiex/sdio.c 2013-09-16 01:27:45.977768390 -0600
@@ -253,11 +253,14 @@ @@ -253,11 +253,14 @@
return 0; return 0;
} }
@ -12368,7 +12521,7 @@ diff -ruN a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/s
+MODULE_FIRMWARE(SD8787_DEFAULT_FW_NAME); +MODULE_FIRMWARE(SD8787_DEFAULT_FW_NAME);
diff -ruN a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/mwifiex/sdio.h diff -ruN a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/mwifiex/sdio.h
--- a/drivers/net/wireless/mwifiex/sdio.h 2011-10-24 01:10:05.000000000 -0600 --- a/drivers/net/wireless/mwifiex/sdio.h 2011-10-24 01:10:05.000000000 -0600
+++ b/drivers/net/wireless/mwifiex/sdio.h 2013-09-05 23:13:24.046844727 -0600 +++ b/drivers/net/wireless/mwifiex/sdio.h 2013-09-16 01:27:45.977768390 -0600
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
#include "main.h" #include "main.h"
@ -12379,7 +12532,7 @@ diff -ruN a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/mwifiex/s
#define BLOCK_MODE 1 #define BLOCK_MODE 1
diff -ruN a/include/linux/bubba3.h b/include/linux/bubba3.h 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 --- a/include/linux/bubba3.h 1969-12-31 17:00:00.000000000 -0700
+++ b/include/linux/bubba3.h 2013-09-05 23:13:24.046844727 -0600 +++ b/include/linux/bubba3.h 2013-09-16 01:27:45.987768263 -0600
@@ -0,0 +1,41 @@ @@ -0,0 +1,41 @@
+/* +/*
+ * (C) Copyright 2010 + * (C) Copyright 2010
@ -12424,7 +12577,7 @@ diff -ruN a/include/linux/bubba3.h b/include/linux/bubba3.h
+#endif +#endif
diff -ruN a/include/linux/nsa3xx-hwmon.h b/include/linux/nsa3xx-hwmon.h 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 --- a/include/linux/nsa3xx-hwmon.h 1969-12-31 17:00:00.000000000 -0700
+++ b/include/linux/nsa3xx-hwmon.h 2013-09-05 23:13:24.046844727 -0600 +++ b/include/linux/nsa3xx-hwmon.h 2013-09-16 01:27:45.987768263 -0600
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
+/* +/*
+ * include/linux/nsa3xx.hwmon.h + * include/linux/nsa3xx.hwmon.h
@ -12449,7 +12602,7 @@ diff -ruN a/include/linux/nsa3xx-hwmon.h b/include/linux/nsa3xx-hwmon.h
+#endif /* __LINUX_NSA3XX_HWMON_H */ +#endif /* __LINUX_NSA3XX_HWMON_H */
diff -ruN a/scripts/basic/.fixdep.cmd b/scripts/basic/.fixdep.cmd diff -ruN a/scripts/basic/.fixdep.cmd b/scripts/basic/.fixdep.cmd
--- a/scripts/basic/.fixdep.cmd 1969-12-31 17:00:00.000000000 -0700 --- a/scripts/basic/.fixdep.cmd 1969-12-31 17:00:00.000000000 -0700
+++ b/scripts/basic/.fixdep.cmd 2013-09-05 23:13:24.066844350 -0600 +++ b/scripts/basic/.fixdep.cmd 2013-09-16 01:27:45.987768263 -0600
@@ -0,0 +1,88 @@ @@ -0,0 +1,88 @@
+cmd_scripts/basic/fixdep := gcc -Wp,-MD,scripts/basic/.fixdep.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -o scripts/basic/fixdep scripts/basic/fixdep.c +cmd_scripts/basic/fixdep := gcc -Wp,-MD,scripts/basic/.fixdep.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -o scripts/basic/fixdep scripts/basic/fixdep.c
+ +
@ -12541,7 +12694,7 @@ diff -ruN a/scripts/basic/.fixdep.cmd b/scripts/basic/.fixdep.cmd
+$(deps_scripts/basic/fixdep): +$(deps_scripts/basic/fixdep):
diff -ruN a/scripts/kconfig/.conf.o.cmd b/scripts/kconfig/.conf.o.cmd diff -ruN a/scripts/kconfig/.conf.o.cmd b/scripts/kconfig/.conf.o.cmd
--- a/scripts/kconfig/.conf.o.cmd 1969-12-31 17:00:00.000000000 -0700 --- a/scripts/kconfig/.conf.o.cmd 1969-12-31 17:00:00.000000000 -0700
+++ b/scripts/kconfig/.conf.o.cmd 2013-09-05 23:13:24.066844350 -0600 +++ b/scripts/kconfig/.conf.o.cmd 2013-09-16 01:27:45.987768263 -0600
@@ -0,0 +1,67 @@ @@ -0,0 +1,67 @@
+cmd_scripts/kconfig/conf.o := gcc -Wp,-MD,scripts/kconfig/.conf.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/conf.o scripts/kconfig/conf.c +cmd_scripts/kconfig/conf.o := gcc -Wp,-MD,scripts/kconfig/.conf.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/conf.o scripts/kconfig/conf.c
+ +
@ -12612,7 +12765,7 @@ diff -ruN a/scripts/kconfig/.conf.o.cmd b/scripts/kconfig/.conf.o.cmd
+$(deps_scripts/kconfig/conf.o): +$(deps_scripts/kconfig/conf.o):
diff -ruN a/scripts/kconfig/lxdialog/.checklist.o.cmd b/scripts/kconfig/lxdialog/.checklist.o.cmd diff -ruN a/scripts/kconfig/lxdialog/.checklist.o.cmd b/scripts/kconfig/lxdialog/.checklist.o.cmd
--- a/scripts/kconfig/lxdialog/.checklist.o.cmd 1969-12-31 17:00:00.000000000 -0700 --- a/scripts/kconfig/lxdialog/.checklist.o.cmd 1969-12-31 17:00:00.000000000 -0700
+++ b/scripts/kconfig/lxdialog/.checklist.o.cmd 2013-09-05 23:13:24.066844350 -0600 +++ b/scripts/kconfig/lxdialog/.checklist.o.cmd 2013-09-16 01:27:45.987768263 -0600
@@ -0,0 +1,66 @@ @@ -0,0 +1,66 @@
+cmd_scripts/kconfig/lxdialog/checklist.o := gcc -Wp,-MD,scripts/kconfig/lxdialog/.checklist.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/lxdialog/checklist.o scripts/kconfig/lxdialog/checklist.c +cmd_scripts/kconfig/lxdialog/checklist.o := gcc -Wp,-MD,scripts/kconfig/lxdialog/.checklist.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/lxdialog/checklist.o scripts/kconfig/lxdialog/checklist.c
+ +
@ -12682,7 +12835,7 @@ diff -ruN a/scripts/kconfig/lxdialog/.checklist.o.cmd b/scripts/kconfig/lxdialog
+$(deps_scripts/kconfig/lxdialog/checklist.o): +$(deps_scripts/kconfig/lxdialog/checklist.o):
diff -ruN a/scripts/kconfig/lxdialog/.inputbox.o.cmd b/scripts/kconfig/lxdialog/.inputbox.o.cmd diff -ruN a/scripts/kconfig/lxdialog/.inputbox.o.cmd b/scripts/kconfig/lxdialog/.inputbox.o.cmd
--- a/scripts/kconfig/lxdialog/.inputbox.o.cmd 1969-12-31 17:00:00.000000000 -0700 --- a/scripts/kconfig/lxdialog/.inputbox.o.cmd 1969-12-31 17:00:00.000000000 -0700
+++ b/scripts/kconfig/lxdialog/.inputbox.o.cmd 2013-09-05 23:13:24.066844350 -0600 +++ b/scripts/kconfig/lxdialog/.inputbox.o.cmd 2013-09-16 01:27:45.987768263 -0600
@@ -0,0 +1,66 @@ @@ -0,0 +1,66 @@
+cmd_scripts/kconfig/lxdialog/inputbox.o := gcc -Wp,-MD,scripts/kconfig/lxdialog/.inputbox.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/lxdialog/inputbox.o scripts/kconfig/lxdialog/inputbox.c +cmd_scripts/kconfig/lxdialog/inputbox.o := gcc -Wp,-MD,scripts/kconfig/lxdialog/.inputbox.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/lxdialog/inputbox.o scripts/kconfig/lxdialog/inputbox.c
+ +
@ -12752,7 +12905,7 @@ diff -ruN a/scripts/kconfig/lxdialog/.inputbox.o.cmd b/scripts/kconfig/lxdialog/
+$(deps_scripts/kconfig/lxdialog/inputbox.o): +$(deps_scripts/kconfig/lxdialog/inputbox.o):
diff -ruN a/scripts/kconfig/lxdialog/.menubox.o.cmd b/scripts/kconfig/lxdialog/.menubox.o.cmd diff -ruN a/scripts/kconfig/lxdialog/.menubox.o.cmd b/scripts/kconfig/lxdialog/.menubox.o.cmd
--- a/scripts/kconfig/lxdialog/.menubox.o.cmd 1969-12-31 17:00:00.000000000 -0700 --- a/scripts/kconfig/lxdialog/.menubox.o.cmd 1969-12-31 17:00:00.000000000 -0700
+++ b/scripts/kconfig/lxdialog/.menubox.o.cmd 2013-09-05 23:13:24.076844162 -0600 +++ b/scripts/kconfig/lxdialog/.menubox.o.cmd 2013-09-16 01:27:45.997768135 -0600
@@ -0,0 +1,66 @@ @@ -0,0 +1,66 @@
+cmd_scripts/kconfig/lxdialog/menubox.o := gcc -Wp,-MD,scripts/kconfig/lxdialog/.menubox.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/lxdialog/menubox.o scripts/kconfig/lxdialog/menubox.c +cmd_scripts/kconfig/lxdialog/menubox.o := gcc -Wp,-MD,scripts/kconfig/lxdialog/.menubox.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/lxdialog/menubox.o scripts/kconfig/lxdialog/menubox.c
+ +
@ -12822,7 +12975,7 @@ diff -ruN a/scripts/kconfig/lxdialog/.menubox.o.cmd b/scripts/kconfig/lxdialog/.
+$(deps_scripts/kconfig/lxdialog/menubox.o): +$(deps_scripts/kconfig/lxdialog/menubox.o):
diff -ruN a/scripts/kconfig/lxdialog/.textbox.o.cmd b/scripts/kconfig/lxdialog/.textbox.o.cmd diff -ruN a/scripts/kconfig/lxdialog/.textbox.o.cmd b/scripts/kconfig/lxdialog/.textbox.o.cmd
--- a/scripts/kconfig/lxdialog/.textbox.o.cmd 1969-12-31 17:00:00.000000000 -0700 --- a/scripts/kconfig/lxdialog/.textbox.o.cmd 1969-12-31 17:00:00.000000000 -0700
+++ b/scripts/kconfig/lxdialog/.textbox.o.cmd 2013-09-05 23:13:24.076844162 -0600 +++ b/scripts/kconfig/lxdialog/.textbox.o.cmd 2013-09-16 01:27:45.997768135 -0600
@@ -0,0 +1,66 @@ @@ -0,0 +1,66 @@
+cmd_scripts/kconfig/lxdialog/textbox.o := gcc -Wp,-MD,scripts/kconfig/lxdialog/.textbox.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/lxdialog/textbox.o scripts/kconfig/lxdialog/textbox.c +cmd_scripts/kconfig/lxdialog/textbox.o := gcc -Wp,-MD,scripts/kconfig/lxdialog/.textbox.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/lxdialog/textbox.o scripts/kconfig/lxdialog/textbox.c
+ +
@ -12892,7 +13045,7 @@ diff -ruN a/scripts/kconfig/lxdialog/.textbox.o.cmd b/scripts/kconfig/lxdialog/.
+$(deps_scripts/kconfig/lxdialog/textbox.o): +$(deps_scripts/kconfig/lxdialog/textbox.o):
diff -ruN a/scripts/kconfig/lxdialog/.util.o.cmd b/scripts/kconfig/lxdialog/.util.o.cmd diff -ruN a/scripts/kconfig/lxdialog/.util.o.cmd b/scripts/kconfig/lxdialog/.util.o.cmd
--- a/scripts/kconfig/lxdialog/.util.o.cmd 1969-12-31 17:00:00.000000000 -0700 --- a/scripts/kconfig/lxdialog/.util.o.cmd 1969-12-31 17:00:00.000000000 -0700
+++ b/scripts/kconfig/lxdialog/.util.o.cmd 2013-09-05 23:13:24.076844162 -0600 +++ b/scripts/kconfig/lxdialog/.util.o.cmd 2013-09-16 01:27:45.997768135 -0600
@@ -0,0 +1,67 @@ @@ -0,0 +1,67 @@
+cmd_scripts/kconfig/lxdialog/util.o := gcc -Wp,-MD,scripts/kconfig/lxdialog/.util.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/lxdialog/util.o scripts/kconfig/lxdialog/util.c +cmd_scripts/kconfig/lxdialog/util.o := gcc -Wp,-MD,scripts/kconfig/lxdialog/.util.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/lxdialog/util.o scripts/kconfig/lxdialog/util.c
+ +
@ -12963,7 +13116,7 @@ diff -ruN a/scripts/kconfig/lxdialog/.util.o.cmd b/scripts/kconfig/lxdialog/.uti
+$(deps_scripts/kconfig/lxdialog/util.o): +$(deps_scripts/kconfig/lxdialog/util.o):
diff -ruN a/scripts/kconfig/lxdialog/.yesno.o.cmd b/scripts/kconfig/lxdialog/.yesno.o.cmd diff -ruN a/scripts/kconfig/lxdialog/.yesno.o.cmd b/scripts/kconfig/lxdialog/.yesno.o.cmd
--- a/scripts/kconfig/lxdialog/.yesno.o.cmd 1969-12-31 17:00:00.000000000 -0700 --- a/scripts/kconfig/lxdialog/.yesno.o.cmd 1969-12-31 17:00:00.000000000 -0700
+++ b/scripts/kconfig/lxdialog/.yesno.o.cmd 2013-09-05 23:13:24.076844162 -0600 +++ b/scripts/kconfig/lxdialog/.yesno.o.cmd 2013-09-16 01:27:45.997768135 -0600
@@ -0,0 +1,66 @@ @@ -0,0 +1,66 @@
+cmd_scripts/kconfig/lxdialog/yesno.o := gcc -Wp,-MD,scripts/kconfig/lxdialog/.yesno.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/lxdialog/yesno.o scripts/kconfig/lxdialog/yesno.c +cmd_scripts/kconfig/lxdialog/yesno.o := gcc -Wp,-MD,scripts/kconfig/lxdialog/.yesno.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/lxdialog/yesno.o scripts/kconfig/lxdialog/yesno.c
+ +
@ -13033,12 +13186,12 @@ diff -ruN a/scripts/kconfig/lxdialog/.yesno.o.cmd b/scripts/kconfig/lxdialog/.ye
+$(deps_scripts/kconfig/lxdialog/yesno.o): +$(deps_scripts/kconfig/lxdialog/yesno.o):
diff -ruN a/scripts/kconfig/.mconf.cmd b/scripts/kconfig/.mconf.cmd diff -ruN a/scripts/kconfig/.mconf.cmd b/scripts/kconfig/.mconf.cmd
--- a/scripts/kconfig/.mconf.cmd 1969-12-31 17:00:00.000000000 -0700 --- a/scripts/kconfig/.mconf.cmd 1969-12-31 17:00:00.000000000 -0700
+++ b/scripts/kconfig/.mconf.cmd 2013-09-05 23:13:24.076844162 -0600 +++ b/scripts/kconfig/.mconf.cmd 2013-09-16 01:27:45.997768135 -0600
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+cmd_scripts/kconfig/mconf := gcc -o scripts/kconfig/mconf scripts/kconfig/mconf.o scripts/kconfig/zconf.tab.o scripts/kconfig/lxdialog/checklist.o scripts/kconfig/lxdialog/util.o scripts/kconfig/lxdialog/inputbox.o scripts/kconfig/lxdialog/textbox.o scripts/kconfig/lxdialog/yesno.o scripts/kconfig/lxdialog/menubox.o -lncursesw +cmd_scripts/kconfig/mconf := gcc -o scripts/kconfig/mconf scripts/kconfig/mconf.o scripts/kconfig/zconf.tab.o scripts/kconfig/lxdialog/checklist.o scripts/kconfig/lxdialog/util.o scripts/kconfig/lxdialog/inputbox.o scripts/kconfig/lxdialog/textbox.o scripts/kconfig/lxdialog/yesno.o scripts/kconfig/lxdialog/menubox.o -lncursesw
diff -ruN a/scripts/kconfig/.mconf.o.cmd b/scripts/kconfig/.mconf.o.cmd diff -ruN a/scripts/kconfig/.mconf.o.cmd b/scripts/kconfig/.mconf.o.cmd
--- a/scripts/kconfig/.mconf.o.cmd 1969-12-31 17:00:00.000000000 -0700 --- a/scripts/kconfig/.mconf.o.cmd 1969-12-31 17:00:00.000000000 -0700
+++ b/scripts/kconfig/.mconf.o.cmd 2013-09-05 23:13:24.076844162 -0600 +++ b/scripts/kconfig/.mconf.o.cmd 2013-09-16 01:27:46.007768007 -0600
@@ -0,0 +1,86 @@ @@ -0,0 +1,86 @@
+cmd_scripts/kconfig/mconf.o := gcc -Wp,-MD,scripts/kconfig/.mconf.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/mconf.o scripts/kconfig/mconf.c +cmd_scripts/kconfig/mconf.o := gcc -Wp,-MD,scripts/kconfig/.mconf.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/mconf.o scripts/kconfig/mconf.c
+ +
@ -13128,7 +13281,7 @@ diff -ruN a/scripts/kconfig/.mconf.o.cmd b/scripts/kconfig/.mconf.o.cmd
+$(deps_scripts/kconfig/mconf.o): +$(deps_scripts/kconfig/mconf.o):
diff -ruN a/scripts/kconfig/zconf.hash.c b/scripts/kconfig/zconf.hash.c diff -ruN a/scripts/kconfig/zconf.hash.c b/scripts/kconfig/zconf.hash.c
--- a/scripts/kconfig/zconf.hash.c 1969-12-31 17:00:00.000000000 -0700 --- a/scripts/kconfig/zconf.hash.c 1969-12-31 17:00:00.000000000 -0700
+++ b/scripts/kconfig/zconf.hash.c 2013-09-05 23:13:24.086843974 -0600 +++ b/scripts/kconfig/zconf.hash.c 2013-09-16 01:27:46.007768007 -0600
@@ -0,0 +1,286 @@ @@ -0,0 +1,286 @@
+/* ANSI-C code produced by gperf version 3.0.4 */ +/* ANSI-C code produced by gperf version 3.0.4 */
+/* Command-line: gperf -t --output-file scripts/kconfig/zconf.hash.c_shipped -a -C -E -g -k '1,3,$' -p -t scripts/kconfig/zconf.gperf */ +/* Command-line: gperf -t --output-file scripts/kconfig/zconf.hash.c_shipped -a -C -E -g -k '1,3,$' -p -t scripts/kconfig/zconf.gperf */
@ -13418,7 +13571,7 @@ diff -ruN a/scripts/kconfig/zconf.hash.c b/scripts/kconfig/zconf.hash.c
+ +
diff -ruN a/scripts/kconfig/zconf.lex.c b/scripts/kconfig/zconf.lex.c diff -ruN a/scripts/kconfig/zconf.lex.c b/scripts/kconfig/zconf.lex.c
--- a/scripts/kconfig/zconf.lex.c 1969-12-31 17:00:00.000000000 -0700 --- a/scripts/kconfig/zconf.lex.c 1969-12-31 17:00:00.000000000 -0700
+++ b/scripts/kconfig/zconf.lex.c 2013-09-05 23:13:24.096843785 -0600 +++ b/scripts/kconfig/zconf.lex.c 2013-09-16 01:27:46.027767752 -0600
@@ -0,0 +1,2420 @@ @@ -0,0 +1,2420 @@
+ +
+#line 3 "scripts/kconfig/zconf.lex.c_shipped" +#line 3 "scripts/kconfig/zconf.lex.c_shipped"
@ -15842,7 +15995,7 @@ diff -ruN a/scripts/kconfig/zconf.lex.c b/scripts/kconfig/zconf.lex.c
+ +
diff -ruN a/scripts/kconfig/zconf.tab.c b/scripts/kconfig/zconf.tab.c diff -ruN a/scripts/kconfig/zconf.tab.c b/scripts/kconfig/zconf.tab.c
--- a/scripts/kconfig/zconf.tab.c 1969-12-31 17:00:00.000000000 -0700 --- a/scripts/kconfig/zconf.tab.c 1969-12-31 17:00:00.000000000 -0700
+++ b/scripts/kconfig/zconf.tab.c 2013-09-05 23:13:24.116843409 -0600 +++ b/scripts/kconfig/zconf.tab.c 2013-09-16 01:27:46.047767496 -0600
@@ -0,0 +1,2504 @@ @@ -0,0 +1,2504 @@
+/* A Bison parser, made by GNU Bison 2.4.3. */ +/* A Bison parser, made by GNU Bison 2.4.3. */
+ +
@ -18350,7 +18503,7 @@ diff -ruN a/scripts/kconfig/zconf.tab.c b/scripts/kconfig/zconf.tab.c
+ +
diff -ruN a/scripts/kconfig/.zconf.tab.o.cmd b/scripts/kconfig/.zconf.tab.o.cmd diff -ruN a/scripts/kconfig/.zconf.tab.o.cmd b/scripts/kconfig/.zconf.tab.o.cmd
--- a/scripts/kconfig/.zconf.tab.o.cmd 1969-12-31 17:00:00.000000000 -0700 --- a/scripts/kconfig/.zconf.tab.o.cmd 1969-12-31 17:00:00.000000000 -0700
+++ b/scripts/kconfig/.zconf.tab.o.cmd 2013-09-05 23:13:24.126843220 -0600 +++ b/scripts/kconfig/.zconf.tab.o.cmd 2013-09-16 01:27:46.047767496 -0600
@@ -0,0 +1,95 @@ @@ -0,0 +1,95 @@
+cmd_scripts/kconfig/zconf.tab.o := gcc -Wp,-MD,scripts/kconfig/.zconf.tab.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -Iscripts/kconfig -c -o scripts/kconfig/zconf.tab.o scripts/kconfig/zconf.tab.c +cmd_scripts/kconfig/zconf.tab.o := gcc -Wp,-MD,scripts/kconfig/.zconf.tab.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -Iscripts/kconfig -c -o scripts/kconfig/zconf.tab.o scripts/kconfig/zconf.tab.c
+ +

5
core/linux/config
View file

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm 3.1.10-24 Kernel Configuration # Linux/arm 3.1.10-25 Kernel Configuration
# #
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@ -301,6 +301,7 @@ CONFIG_MACH_MV88F6281GTW_GE=y
CONFIG_MACH_SHEEVAPLUG=y CONFIG_MACH_SHEEVAPLUG=y
CONFIG_MACH_ESATA_SHEEVAPLUG=y CONFIG_MACH_ESATA_SHEEVAPLUG=y
CONFIG_MACH_GURUPLUG=y CONFIG_MACH_GURUPLUG=y
CONFIG_MACH_DREAMPLUG=y
CONFIG_MACH_TS219=y CONFIG_MACH_TS219=y
CONFIG_MACH_TS41X=y CONFIG_MACH_TS41X=y
CONFIG_MACH_DOCKSTAR=y CONFIG_MACH_DOCKSTAR=y
@ -403,6 +404,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=999999
CONFIG_ZONE_DMA_FLAG=0 CONFIG_ZONE_DMA_FLAG=0
CONFIG_VIRT_TO_BUS=y CONFIG_VIRT_TO_BUS=y
CONFIG_KSM=y CONFIG_KSM=y
CONFIG_UKSM=y
# CONFIG_KSM_LEGACY is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
CONFIG_NEED_PER_CPU_KM=y CONFIG_NEED_PER_CPU_KM=y
# CONFIG_CLEANCACHE is not set # CONFIG_CLEANCACHE is not set

2
core/linux/linux.install
View file

@ -2,7 +2,7 @@
# arg 2: the old package version # arg 2: the old package version
KERNEL_NAME= KERNEL_NAME=
KERNEL_VERSION=3.1.10-25-ARCH KERNEL_VERSION=3.1.10-26-ARCH
post_install () { post_install () {
# updating module dependencies # updating module dependencies