diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-19 09:02:14 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-19 09:02:14 +0100 |
commit | 80da549e5225c6f80d45f76ba2b3a4574ed278ae (patch) | |
tree | 59799c3d7b7d4a088abdfa3052c3682ed826ba7e /arch/parisc/include/asm/param.h | |
parent | ASoC: wm2200: Convert over to wm_adsp for ADSP1 support (diff) | |
parent | Linux 3.7-rc6 (diff) | |
download | linux-80da549e5225c6f80d45f76ba2b3a4574ed278ae.tar.xz linux-80da549e5225c6f80d45f76ba2b3a4574ed278ae.zip |
Merge tag 'v3.7-rc6' into asoc-wm2200
Linux 3.7-rc6
Diffstat (limited to 'arch/parisc/include/asm/param.h')
-rw-r--r-- | arch/parisc/include/asm/param.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/param.h b/arch/parisc/include/asm/param.h deleted file mode 100644 index 965d45427975..000000000000 --- a/arch/parisc/include/asm/param.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/param.h> |