Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3840df9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'drivers/pxa-gpio' into next/drivers

parents 3642a0a2 e0bf102e

arch/arm/mach-pxa/corgi_pm.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/kernel.h>

#include <linux/delay.h>

#include <linux/gpio.h>

#include <linux/gpio-pxa.h>

#include <linux/interrupt.h>

#include <linux/platform_device.h>

#include <linux/apm-emulation.h>

arch/arm/mach-pxa/spitz_pm.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/kernel.h>

#include <linux/delay.h>

#include <linux/gpio.h>

#include <linux/gpio-pxa.h>

#include <linux/interrupt.h>

#include <linux/platform_device.h>

#include <linux/apm-emulation.h>