From 51b96d1b44fb95158059568d9ff60f47ffb7c2ea Mon Sep 17 00:00:00 2001
From: Helge Deller <deller@gmx.de>
Date: Sun, 27 May 2007 18:20:47 +0200
Subject: [PATCH] --- yaml --- r: 57750 b: refs/heads/master c:
 25971f68d392f1816e21520e9e59648403b0bdad h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/parisc/ccio-dma.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 377a165a18b3..0cf9c0bb5c4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48a7d5c66b3cecc40364d62cfd54c502c0979561
+refs/heads/master: 25971f68d392f1816e21520e9e59648403b0bdad
diff --git a/trunk/drivers/parisc/ccio-dma.c b/trunk/drivers/parisc/ccio-dma.c
index 1459ca8fffc7..b3c4dbff26b8 100644
--- a/trunk/drivers/parisc/ccio-dma.c
+++ b/trunk/drivers/parisc/ccio-dma.c
@@ -1227,7 +1227,7 @@ ccio_get_iotlb_size(struct parisc_device *dev)
 #endif /* 0 */
 
 /* We *can't* support JAVA (T600). Venture there at your own risk. */
-static struct parisc_device_id ccio_tbl[] = {
+static const struct parisc_device_id ccio_tbl[] = {
 	{ HPHW_IOA, HVERSION_REV_ANY_ID, U2_IOA_RUNWAY, 0xb }, /* U2 */
 	{ HPHW_IOA, HVERSION_REV_ANY_ID, UTURN_IOA_RUNWAY, 0xb }, /* UTurn */
 	{ 0, }
@@ -1370,7 +1370,7 @@ ccio_ioc_init(struct ioc *ioc)
 	}
 }
 
-static void
+static void __init
 ccio_init_resource(struct resource *res, char *name, void __iomem *ioaddr)
 {
 	int result;
@@ -1537,7 +1537,7 @@ int ccio_request_resource(const struct parisc_device *dev,
  * If so, initialize the chip and tell other partners in crime they
  * have work to do.
  */
-static int ccio_probe(struct parisc_device *dev)
+static int __init ccio_probe(struct parisc_device *dev)
 {
 	int i;
 	struct ioc *ioc, **ioc_p = &ioc_list;