Merge tag 'locks-v3.16-2' of git://git.samba.org/jlayton/linux

[linux/fpc-iii.git] / arch / arm / mach-pxa / include / mach / pxa300.h

#ifndef __MACH_PXA300_H
#define __MACH_PXA300_H

#include <mach/pxa3xx.h>
#include <mach/mfp-pxa300.h>

#endif /* __MACH_PXA300_H */