Merge branch 'master' of git://gitorious.org/linux-on-wince-htc/linux_on_wince_htc

This commit is contained in:
Jon Benson 2010-10-18 00:54:21 +11:00
commit c08b0fe05a

View File

@ -407,7 +407,7 @@ static irqreturn_t htcleo_ts_irq_handler(int irq, void *dev_id)
static uint32_t touch_on_gpio_table[] =
{
PCOM_GPIO_CFG(HTCLEO_GPIO_TS_IRQ, 0, GPIO_INPUT, GPIO_PULL_UP, GPIO_2MA),
PCOM_GPIO_CFG(HTCLEO_GPIO_TS_IRQ, 0, GPIO_INPUT, GPIO_PULL_UP, GPIO_8MA),
};
static int htcleo_ts_probe(struct i2c_client *client, const struct i2c_device_id *id)