diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-19 17:59:44 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-19 17:59:44 -0400 |
| commit | c7c350e92aab1bba68f26a6027b734adcf9824ba (patch) | |
| tree | aa99bd94c3049dd871d9c030d70a5f3d87591a95 /arch/arm/mach-netx | |
| parent | 2f42b5d043ee271d1e5d30ecd77186b6c4d4e534 (diff) | |
| parent | f8512ad0da16cbe156f3a7627971cdf0b39c4138 (diff) | |
Merge branch 'hotfixes' into devel
Diffstat (limited to 'arch/arm/mach-netx')
| -rw-r--r-- | arch/arm/mach-netx/generic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c index b9ca8f98265d..fd7537f7d11e 100644 --- a/arch/arm/mach-netx/generic.c +++ b/arch/arm/mach-netx/generic.c | |||
| @@ -133,7 +133,7 @@ netx_hif_ack_irq(unsigned int _irq) | |||
| 133 | val &= ~((1 << 24) << irq); | 133 | val &= ~((1 << 24) << irq); |
| 134 | writel(val, NETX_DPMAS_INT_EN); | 134 | writel(val, NETX_DPMAS_INT_EN); |
| 135 | 135 | ||
| 136 | DEBUG_IRQ("%s: irq %d\n", __FUNCTION__, _irq); | 136 | DEBUG_IRQ("%s: irq %d\n", __func__, _irq); |
| 137 | } | 137 | } |
| 138 | 138 | ||
| 139 | static void | 139 | static void |
| @@ -145,7 +145,7 @@ netx_hif_mask_irq(unsigned int _irq) | |||
| 145 | val = readl(NETX_DPMAS_INT_EN); | 145 | val = readl(NETX_DPMAS_INT_EN); |
| 146 | val &= ~((1 << 24) << irq); | 146 | val &= ~((1 << 24) << irq); |
| 147 | writel(val, NETX_DPMAS_INT_EN); | 147 | writel(val, NETX_DPMAS_INT_EN); |
| 148 | DEBUG_IRQ("%s: irq %d\n", __FUNCTION__, _irq); | 148 | DEBUG_IRQ("%s: irq %d\n", __func__, _irq); |
| 149 | } | 149 | } |
| 150 | 150 | ||
| 151 | static void | 151 | static void |
| @@ -157,7 +157,7 @@ netx_hif_unmask_irq(unsigned int _irq) | |||
| 157 | val = readl(NETX_DPMAS_INT_EN); | 157 | val = readl(NETX_DPMAS_INT_EN); |
| 158 | val |= (1 << 24) << irq; | 158 | val |= (1 << 24) << irq; |
| 159 | writel(val, NETX_DPMAS_INT_EN); | 159 | writel(val, NETX_DPMAS_INT_EN); |
| 160 | DEBUG_IRQ("%s: irq %d\n", __FUNCTION__, _irq); | 160 | DEBUG_IRQ("%s: irq %d\n", __func__, _irq); |
| 161 | } | 161 | } |
| 162 | 162 | ||
| 163 | static struct irq_chip netx_hif_chip = { | 163 | static struct irq_chip netx_hif_chip = { |