git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-at91
/
board-cap9adk.c
diff --git
a/arch/arm/mach-at91/board-cap9adk.c
b/arch/arm/mach-at91/board-cap9adk.c
index 83a1a0fef47be359b7138f4584d734a6f1ff5ae0..d6940870e403fb8d7e1e15bac38ed2e6a0e4899f 100644
(file)
--- a/
arch/arm/mach-at91/board-cap9adk.c
+++ b/
arch/arm/mach-at91/board-cap9adk.c
@@
-364,7
+364,7
@@
static struct atmel_lcdfb_info __initdata cap9adk_lcdc_data;
/*
* AC97
*/
-static struct a
tmel_ac97
_data cap9adk_ac97_data = {
+static struct a
c97c_platform
_data cap9adk_ac97_data = {
// .reset_pin = ... not connected
};