diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-08 07:56:19 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-08 07:56:19 +0200 |
| commit | 18d4ed4342c14ebeebe60d267b171053efcdfa87 (patch) | |
| tree | f315e77f66cbb70869e2f80cde5c18380a80901e /Documentation/isdn/README.HiSax | |
| parent | ASoC: Remove redundant -codec from WM8580 driver name (diff) | |
| parent | Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broon... (diff) | |
| download | linux-18d4ed4342c14ebeebe60d267b171053efcdfa87.tar.xz linux-18d4ed4342c14ebeebe60d267b171053efcdfa87.zip | |
Merge branch 'for-3.1' into for-3.2
Conflict due to the fix for the register map failure - taken the for-3.1
version.
Conflicts:
sound/soc/codecs/sgtl5000.c
Diffstat (limited to 'Documentation/isdn/README.HiSax')
| -rw-r--r-- | Documentation/isdn/README.HiSax | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/isdn/README.HiSax b/Documentation/isdn/README.HiSax index 99e87a61897d..b1a573cf4472 100644 --- a/Documentation/isdn/README.HiSax +++ b/Documentation/isdn/README.HiSax @@ -506,7 +506,7 @@ to e.g. the Internet: <ISDN subsystem - ISDN support -- HiSax> make clean; make zImage; make modules; make modules_install 2. Install the new kernel - cp /usr/src/linux/arch/i386/boot/zImage /etc/kernel/linux.isdn + cp /usr/src/linux/arch/x86/boot/zImage /etc/kernel/linux.isdn vi /etc/lilo.conf <add new kernel in the bootable image section> lilo |