diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-09-11 12:49:39 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-09-11 12:49:39 +0100 |
| commit | cd38bcdac64aec45575ed58de66db4a2fbf1914d (patch) | |
| tree | 450333c7a1c67685db627edda3e1376a5bd46a2e /include | |
| parent | 166226209d59b1210cadfdec6b31e7d633100d9d (diff) | |
| parent | a3587e4ed77974adfb057af261aaeea4022018e8 (diff) | |
Merge commit 'remotes/openmoko/andy-tracking' into drm-tracking
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/pcf50633/adc.h | 3 | ||||
| -rw-r--r-- | include/linux/mfd/pcf50633/core.h | 3 | ||||
| -rw-r--r-- | include/linux/mfd/pcf50633/mbc.h | 1 | ||||
| -rw-r--r-- | include/linux/resume-dependency.h | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/mfd/pcf50633/adc.h b/include/linux/mfd/pcf50633/adc.h index 56669b4183a..b35e62801ff 100644 --- a/include/linux/mfd/pcf50633/adc.h +++ b/include/linux/mfd/pcf50633/adc.h @@ -25,7 +25,8 @@ #define PCF50633_REG_ADCS3 0x57 #define PCF50633_ADCC1_ADCSTART 0x01 -#define PCF50633_ADCC1_RES_10BIT 0x02 +#define PCF50633_ADCC1_RES_8BIT 0x02 +#define PCF50633_ADCC1_RES_10BIT 0x00 #define PCF50633_ADCC1_AVERAGE_NO 0x00 #define PCF50633_ADCC1_AVERAGE_4 0x04 #define PCF50633_ADCC1_AVERAGE_8 0x08 diff --git a/include/linux/mfd/pcf50633/core.h b/include/linux/mfd/pcf50633/core.h index af67b4e3ec6..c8125f2e99e 100644 --- a/include/linux/mfd/pcf50633/core.h +++ b/include/linux/mfd/pcf50633/core.h @@ -29,8 +29,6 @@ struct pcf50633_platform_data { char **batteries; int num_batteries; - int charging_restart_interval; - int chg_ref_current_ma; /* Callbacks */ @@ -138,6 +136,7 @@ struct pcf50633 { int irq; struct pcf50633_irq irq_handler[PCF50633_NUM_IRQ]; struct work_struct irq_work; + struct workqueue_struct *work_queue; struct mutex lock; u8 mask_regs[5]; diff --git a/include/linux/mfd/pcf50633/mbc.h b/include/linux/mfd/pcf50633/mbc.h index 747725b0cd0..e6328a664b3 100644 --- a/include/linux/mfd/pcf50633/mbc.h +++ b/include/linux/mfd/pcf50633/mbc.h @@ -128,5 +128,6 @@ enum pcf50633_reg_mbcs3 { int pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma); int pcf50633_mbc_get_status(struct pcf50633 *); +int pcf50633_mbc_get_usb_online_status(struct pcf50633 *); #endif diff --git a/include/linux/resume-dependency.h b/include/linux/resume-dependency.h index 2b87af8cac7..f84bf618205 100644 --- a/include/linux/resume-dependency.h +++ b/include/linux/resume-dependency.h @@ -38,7 +38,7 @@ struct resume_dependency { */ #define init_resume_dependency_list(_head) \ - printk(KERN_INFO "##### init_resume_dependency_list(head=%p)\n", (_head)); \ + printk(KERN_DEBUG "##### init_resume_dependency_list(head=%p)\n", (_head)); \ INIT_LIST_HEAD(&(_head)->list); |