Merge ../linus

[linux-drm-fsl-dcu.git] / arch / mips / basler / excite / excite_device.c

diff --git a/arch/mips/basler/excite/excite_device.c b/arch/mips/basler/excite/excite_device.c
index 34ec76716fa0d820ff260f991ce582d8b0e07510..cc1ce77eab4a7fd3757eeba3dc6dd8b1f8505c56 100644 (file)
--- a/arch/mips/basler/excite/excite_device.c
+++ b/arch/mips/basler/excite/excite_device.c
@@ -17,7 +17,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
@@ -69,7 +68,7 @@ enum {
 
 
 static struct resource
-       excite_ctr_resource = {
+       excite_ctr_resource __attribute__((unused)) = {
                .name           = "GPI counters",
                .start          = 0,
                .end            = 5,
@@ -78,7 +77,7 @@ static struct resource
                .sibling        = NULL,
                .child          = NULL
        },
-       excite_gpislice_resource = {
+       excite_gpislice_resource __attribute__((unused)) = {
                .name           = "GPI slices",
                .start          = 0,
                .end            = 1,
@@ -87,7 +86,7 @@ static struct resource
                .sibling        = NULL,
                .child          = NULL
        },
-       excite_mdio_channel_resource = {
+       excite_mdio_channel_resource __attribute__((unused)) = {
                .name           = "MDIO channels",
                .start          = 0,
                .end            = 1,
@@ -96,7 +95,7 @@ static struct resource
                .sibling        = NULL,
                .child          = NULL
        },
-       excite_fifomem_resource = {
+       excite_fifomem_resource __attribute__((unused)) = {
                .name           = "FIFO memory",
                .start          = 0,
                .end            = 767,
@@ -105,7 +104,7 @@ static struct resource
                .sibling        = NULL,
                .child          = NULL
        },
-       excite_scram_resource = {
+       excite_scram_resource __attribute__((unused)) = {
                .name           = "Scratch RAM",
                .start          = EXCITE_PHYS_SCRAM,
                .end            = EXCITE_PHYS_SCRAM + EXCITE_SIZE_SCRAM - 1,
@@ -114,7 +113,7 @@ static struct resource
                .sibling        = NULL,
                .child          = NULL
        },
-       excite_fpga_resource = {
+       excite_fpga_resource __attribute__((unused)) = {
                .name           = "System FPGA",
                .start          = EXCITE_PHYS_FPGA,
                .end            = EXCITE_PHYS_FPGA + EXCITE_SIZE_FPGA - 1,
@@ -123,7 +122,7 @@ static struct resource
                .sibling        = NULL,
                .child          = NULL
        },
-       excite_nand_resource = {
+       excite_nand_resource __attribute__((unused)) = {
                .name           = "NAND flash control",
                .start          = EXCITE_PHYS_NAND,
                .end            = EXCITE_PHYS_NAND + EXCITE_SIZE_NAND - 1,
@@ -132,7 +131,7 @@ static struct resource
                .sibling        = NULL,
                .child          = NULL
        },
-       excite_titan_resource = {
+       excite_titan_resource __attribute__((unused)) = {
                .name           = "TITAN registers",
                .start          = EXCITE_PHYS_TITAN,
                .end            = EXCITE_PHYS_TITAN + EXCITE_SIZE_TITAN - 1,