diff options
| author | Guodong Xu <guodong.xu@linaro.org> | 2013-08-30 09:36:23 +0800 |
|---|---|---|
| committer | Guodong Xu <guodong.xu@linaro.org> | 2013-08-30 09:36:23 +0800 |
| commit | 2df9dcc7754ab98c41a7b898282fb5ab354ab461 (patch) | |
| tree | 1fd4043a4fdf91f7ff3fd80e6da311cb5ad1eb97 | |
| parent | 1fd457b3c21e77577feff798ac96c1a74b39f96a (diff) | |
| parent | a70763702f64c31d9c3b0a9ab1e63c0741f09b6b (diff) | |
Merge commit 'tracking-hilt-highres-0829'; commit 'tracking-hilt-misc-0829' into integration-hilt-lsk-androidintegration-hilt-lsk-android-0830
* commit 'tracking-hilt-highres-0829':
Revert "ARM: defconfig: workaround of RCU STALL"
* commit 'tracking-hilt-misc-0829':
ARM: dts: remove nfs configuration in hi4511
| -rw-r--r-- | arch/arm/boot/dts/hi4511.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/hi4511.dts b/arch/arm/boot/dts/hi4511.dts index c783a0b05bfb..c16690fd50c7 100644 --- a/arch/arm/boot/dts/hi4511.dts +++ b/arch/arm/boot/dts/hi4511.dts @@ -15,7 +15,7 @@ compatible = "hisilicon,hi3620-hi4511"; chosen { - bootargs = "console=ttyAMA0,115200 root=/dev/nfs nfsroot=192.168.1.100:/nfsroot/ ip=192.168.1.101:192.168.1.100::255.255.255.0::eth0:on mem=512m earlyprintk no_console_suspend"; + bootargs = "console=ttyAMA0,115200 root=/dev/ram0 mem=512m earlyprintk no_console_suspend"; }; cpus { |