summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2007-05-27 18:20:47 +0200
committerKyle McMartin <kyle@athena.road.mcmartin.ca>2007-05-27 12:35:59 -0400
commit25971f68d392f1816e21520e9e59648403b0bdad (patch)
treef653d19452d7e10bcc85de1d7ea7b85376023cf0
parent48a7d5c66b3cecc40364d62cfd54c502c0979561 (diff)
downloadop-kernel-dev-25971f68d392f1816e21520e9e59648403b0bdad.zip
op-kernel-dev-25971f68d392f1816e21520e9e59648403b0bdad.tar.gz
[PARISC] fix section mismatch in ccio-dma
Hi Kyle, this fixes section mismatches in ccio-dma. Additionally, mark parisc_device_id table const. Please apply, Helge Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
-rw-r--r--drivers/parisc/ccio-dma.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 1459ca8..b3c4dbf 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/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;
OpenPOWER on IntegriCloud