From a520afa026131a2a87c3726cfd73e67a5093a682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Tue, 28 Sep 2010 16:38:41 +0200 Subject: [PATCH] --- yaml --- r: 220615 b: refs/heads/master c: b4e017e332b873133602f47ae8cacfae64ab82c5 h: refs/heads/master i: 220613: 68eb91c1ad911c8a33b8c24582a0ec05dc2dd1f9 220611: c35ddac564f254dc1df95d215ae09f0b7c998f9d 220607: ba3a12000247dc09dd220f33ca5e050d7baaf193 v: v3 --- [refs] | 2 +- trunk/include/linux/mfd/mc13783.h | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 8948f43a1584..98a11fd1314e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e2bb82ee0d74b621bab452888cc3e7e8a013d0b +refs/heads/master: b4e017e332b873133602f47ae8cacfae64ab82c5 diff --git a/trunk/include/linux/mfd/mc13783.h b/trunk/include/linux/mfd/mc13783.h index 0fa44fb8dd26..5f6aff55eeb7 100644 --- a/trunk/include/linux/mfd/mc13783.h +++ b/trunk/include/linux/mfd/mc13783.h @@ -35,24 +35,6 @@ int mc13783_irq_status(struct mc13783 *mc13783, int irq, int *enabled, int *pending); int mc13783_irq_ack(struct mc13783 *mc13783, int irq); -static inline int mc13783_mask(struct mc13783 *mc13783, int irq) __deprecated; -static inline int mc13783_mask(struct mc13783 *mc13783, int irq) -{ - return mc13783_irq_mask(mc13783, irq); -} - -static inline int mc13783_unmask(struct mc13783 *mc13783, int irq) __deprecated; -static inline int mc13783_unmask(struct mc13783 *mc13783, int irq) -{ - return mc13783_irq_unmask(mc13783, irq); -} - -static inline int mc13783_ackirq(struct mc13783 *mc13783, int irq) __deprecated; -static inline int mc13783_ackirq(struct mc13783 *mc13783, int irq) -{ - return mc13783_irq_ack(mc13783, irq); -} - #define MC13783_ADC0 43 #define MC13783_ADC0_ADREFEN (1 << 10) #define MC13783_ADC0_ADREFMODE (1 << 11)