series: fix up things

Add patches to disable pramfs and axfs as they don't build properly at
the moment.

diff --git a/patches.axfs/axfs-mark-it-broken.patch b/patches.axfs/axfs-mark-it-broken.patch
new file mode 100644 (file)
index 0000000..b2810f1
--- /dev/null
+++ b/patches.axfs/axfs-mark-it-broken.patch
@@ -0,0 +1,23 @@
+From foo@baz Wed Dec  5 14:39:44 PST 2012
+Date: Wed, 05 Dec 2012 14:39:44 -0800
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: axfs: mark it broken
+
+It doesn't build properly in 3.4, so let's not even try.
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/axfs/Kconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/fs/axfs/Kconfig
++++ b/fs/axfs/Kconfig
+@@ -1,5 +1,6 @@
+ config AXFS
+       tristate "Advanced XIP File System (AXFS) support (EXPERIMENTAL)"
++      depends on BROKEN
+       select FS_XIP
+       select ZLIB_INFLATE
+       help

diff --git a/patches.pramfs/pramfs-mark-it-broken.patch b/patches.pramfs/pramfs-mark-it-broken.patch
new file mode 100644 (file)
index 0000000..3a89b97
--- /dev/null
+++ b/patches.pramfs/pramfs-mark-it-broken.patch
@@ -0,0 +1,24 @@
+From foo@baz Wed Dec  5 14:39:44 PST 2012
+Date: Wed, 05 Dec 2012 14:39:44 -0800
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: pramfs: mark it broken
+
+It doesn't build in 3.4, so let's not even try.
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/pramfs/Kconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/pramfs/Kconfig
++++ b/fs/pramfs/Kconfig
+@@ -1,6 +1,6 @@
+ config PRAMFS
+       tristate "Persistent and Protected RAM file system support"
+-      depends on HAS_IOMEM && EXPERIMENTAL
++      depends on HAS_IOMEM && EXPERIMENTAL && BROKEN
+       select CRC16
+       help
+          If your system has a block of fast (comparable in access speed to

diff --git a/series b/series
index e6bec868d4810b8d49cacbbfbe57faa039c10bec..7751045fd5e53bf75dc55084eb9aa7d5c1c17f84 100644 (file)
--- a/series
+++ b/series
@@ -109,6 +109,7 @@ patches.pramfs/14-pramfs-memory-write-protection.patch
 patches.pramfs/15-pramfs-test-module.patch
 patches.pramfs/16-pramfs-ioctl-operations.patch
 patches.pramfs/17-pramfs-makefile-and-kconfig.patch
+patches.pramfs/pramfs-mark-it-broken.patch
 
 
 #############################################################################
@@ -131,6 +132,7 @@ patches.axfs/axfs-axfs_bdev.c.patch
 patches.axfs/axfs-xip-debugging-support.patch
 patches.axfs/axfs-add-documentation.patch
 patches.axfs/axfs-mount-as-rootfs.patch
+patches.axfs/axfs-mark-it-broken.patch
 
 
 #############################################################################
@@ -412,6 +414,15 @@ patches.armadillo800/0106-ARM-shmobile-armadillo800eva-fixup-sound-card-detect.p
 patches.armadillo800/0107-ARM-shmobile-armadillo800eva-enable-rw-rootfs-mount.patch
 patches.armadillo800/asoc-sh-fsi-select-simple-card-on-kconfig.patch
 
+patches.armadillo800/shmobile-r8a7740-add-support-for-vcp-1-vpu-vpc-vio-multimedia-ip.patch
+patches.armadillo800/shmobile-armadillo800eva-set-lcd-color-depth-to-32-bpp.patch
+patches.armadillo800/iommu-shmobile-add-iommu-driver-for-renesas-ipmmu-modules.patch
+patches.armadillo800/shmobile-armadillo800eva-enable-iommu-support.patch
+patches.armadillo800/shmobile-ipmmu-add-basic-pmb-support.patch
+patches.armadillo800/shmobile-r8a7740-set-up-meram-address-range.patch
+patches.armadillo800/shmobile-r8a7740-add-meram-uio-device.patch
+
+
 #############################################################################
 # AT91 board support
 #
@@ -743,3 +754,5 @@ patches.uio/drivers-uio_dmem_genirq-don-t-use-dma_error_code-to-indicate-unmappe
 patches.uio/drivers-uio_dmem_genirq-allow-partial-success-when-opening-device.patch
 patches.uio/drivers-uio-only-allocate-new-private-data-when-probing-device-tree-node.patch
 
+
+