summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-07-20 12:55:02 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2009-07-20 12:55:02 +1000
commite8310cfab5ca8c3201c9c4e2a432cc54d1a2b518 (patch)
tree1de986f7ecccfa1ccff32fae1931debb620f976e /include
parenteca81808ee2d1bcee7d1d4cc6d4932bff75399bd (diff)
parenta663677bf2f1b964f7bfa656d83a78387bd77f7a (diff)
Merge commit 'mfd/for-next'
Diffstat (limited to 'include')
-rw-r--r--include/linux/mfd/ezx-pcap.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/mfd/ezx-pcap.h b/include/linux/mfd/ezx-pcap.h
index c12c3c0932bf..dec82b0b05f9 100644
--- a/include/linux/mfd/ezx-pcap.h
+++ b/include/linux/mfd/ezx-pcap.h
@@ -25,9 +25,12 @@ struct pcap_chip;
int ezx_pcap_write(struct pcap_chip *, u8, u32);
int ezx_pcap_read(struct pcap_chip *, u8, u32 *);
+int ezx_pcap_set_bits(struct pcap_chip *, u8, u32, u32);
int pcap_to_irq(struct pcap_chip *, int);
+int irq_to_pcap(struct pcap_chip *, int);
int pcap_adc_async(struct pcap_chip *, u8, u32, u8[], void *, void *);
int pcap_adc_sync(struct pcap_chip *, u8, u32, u8[], u16[]);
+void pcap_set_ts_bits(struct pcap_chip *, u32);
#define PCAP_SECOND_PORT 1
#define PCAP_CS_AH 2