summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/ti113x.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-03-26 00:54:16 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-03-26 00:54:16 +0200
commit374da9da22ebaad0524c77905b5e89ae4619bef3 (patch)
tree78f8ebbbc2e730b8e510e3a68b5b73755196fb68 /drivers/pcmcia/ti113x.h
parentARM: sa11x0: neponset: don't static map neponset registers (diff)
parentUSB: sa1111: add hcd .reset method (diff)
downloadlinux-374da9da22ebaad0524c77905b5e89ae4619bef3.tar.xz
linux-374da9da22ebaad0524c77905b5e89ae4619bef3.zip
Merge branch 'sa1111' into sa11x0
Conflicts: arch/arm/common/sa1111.c arch/arm/mach-sa1100/neponset.c Fixed: arch/arm/mach-sa1100/assabet.c for the neponset changes
Diffstat (limited to 'drivers/pcmcia/ti113x.h')
0 files changed, 0 insertions, 0 deletions