From 87b12daa7142889b094f93d5d955a936fd9f57b8 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 30 Apr 2012 14:58:45 +0000
Subject: [PATCH] --- yaml --- r: 333295 b: refs/heads/master c:
 58cbdbe0248d0bf3eed47a9ac69d330a140726a9 h: refs/heads/master i:   333293:
 1b0e5ed2c5ad1dba7737d43fe66aee26fd329e3d   333291:
 ae27d67781d2f06dca399f6e61498a2abdd06996   333287:
 3906f53f8818f06b45376f32a746919d6356cb22   333279:
 23a2919734d0e4628b4be9a77b9c9f960c7cecac v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/mach-iop13xx/iq81340sc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 906b4a92a41c..a85553d45e9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b04e246a897bb14f2508015aa708b1f7a484039a
+refs/heads/master: 58cbdbe0248d0bf3eed47a9ac69d330a140726a9
diff --git a/trunk/arch/arm/mach-iop13xx/iq81340sc.c b/trunk/arch/arm/mach-iop13xx/iq81340sc.c
index 060cddde2fd4..e94744111634 100644
--- a/trunk/arch/arm/mach-iop13xx/iq81340sc.c
+++ b/trunk/arch/arm/mach-iop13xx/iq81340sc.c
@@ -30,7 +30,7 @@
 extern int init_atu;
 
 static int __init
-iq81340sc_atux_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
+iq81340sc_atux_map_irq(const struct pci_dev *dev, u8 idsel, u8 pin)
 {
 	WARN_ON(idsel < 1 || idsel > 2);