Hi Greg, Tejun, After merging the driver-core tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/extcon/extcon-adc-jack.c: In function 'adc_jack_probe': drivers/extcon/extcon-adc-jack.c:146:2: error: implicit declaration of function 'INIT_DELAYED_WORK_DEFERRABLE' [-Werror=implicit-function-declaration] Caused by commit 19939860dcae ("extcon: adc_jack: adc-jack driver to support 3.5 pi or simliar devices") from the driver-core tree interacting with commit 203b42f73174 ("workqueue: make deferrable delayed_work initializer names consistent") from the workqueues tree. I have added this merge fix patch (no action is required): From: Stephen Rothwell Date: Thu, 6 Sep 2012 14:45:26 +1000 Subject: [PATCH] extcon: adc_jack: update for INIT_DELAYED_WORK_DEFERRABLE name change Signed-off-by: Stephen Rothwell --- drivers/extcon/extcon-adc-jack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/extcon/extcon-adc-jack.c b/drivers/extcon/extcon-adc-jack.c index 60ac3fb..725eb5a 100644 --- a/drivers/extcon/extcon-adc-jack.c +++ b/drivers/extcon/extcon-adc-jack.c @@ -143,7 +143,7 @@ static int __devinit adc_jack_probe(struct platform_device *pdev) data->handling_delay = msecs_to_jiffies(pdata->handling_delay_ms); - INIT_DELAYED_WORK_DEFERRABLE(&data->handler, adc_jack_handler); + INIT_DEFERRABLE_WORK(&data->handler, adc_jack_handler); platform_set_drvdata(pdev, data); -- 1.7.10.280.gaa39 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/