diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-14 23:12:00 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-14 23:12:00 -0800 |
| commit | 5e30589521518bff36fd2638b3c3d69679c50436 (patch) | |
| tree | 6ac985658a06b0787e4354d0d16d380ea9b16a5a /arch/arm/mach-pxa/include/mach/regs-ac97.h | |
| parent | ac178ef0ae9eb44fd527d87aa9b6394e05f56e1f (diff) | |
| parent | d2f8d7ee1a9b4650b4e43325b321801264f7c37a (diff) | |
| download | op-kernel-dev-5e30589521518bff36fd2638b3c3d69679c50436.zip op-kernel-dev-5e30589521518bff36fd2638b3c3d69679c50436.tar.gz | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/regs-ac97.h')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/regs-ac97.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/regs-ac97.h b/arch/arm/mach-pxa/include/mach/regs-ac97.h index e41b9d2..b8d14bd 100644 --- a/arch/arm/mach-pxa/include/mach/regs-ac97.h +++ b/arch/arm/mach-pxa/include/mach/regs-ac97.h @@ -1,6 +1,8 @@ #ifndef __ASM_ARCH_REGS_AC97_H #define __ASM_ARCH_REGS_AC97_H +#include <mach/hardware.h> + /* * AC97 Controller registers */ |
