summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Bodek <zbb@FreeBSD.org>2013-10-28 07:18:24 +0000
committerZbigniew Bodek <zbb@FreeBSD.org>2013-10-28 07:18:24 +0000
commitbe445686da6ede92bcc114832bdda7549f8295f7 (patch)
tree36f389309b7211b79d94f322d423cc06823601f7
parentc1fd34288c240fd6e07ddad007b221c15463da03 (diff)
Notes
-rw-r--r--sys/arm/conf/ARMADAXP3
-rw-r--r--sys/dev/mvs/mvs_soc.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/arm/conf/ARMADAXP b/sys/arm/conf/ARMADAXP
index 50ed7edc9d51..2b4945971e2b 100644
--- a/sys/arm/conf/ARMADAXP
+++ b/sys/arm/conf/ARMADAXP
@@ -76,8 +76,7 @@ device pass
device da
# SATA
-device ata
-#device mvs
+device mvs
# Serial ports
device uart
diff --git a/sys/dev/mvs/mvs_soc.c b/sys/dev/mvs/mvs_soc.c
index 2edeef0cac65..ca3699361a70 100644
--- a/sys/dev/mvs/mvs_soc.c
+++ b/sys/dev/mvs/mvs_soc.c
@@ -66,6 +66,8 @@ static struct {
{MV_DEV_88F6282, 0x00, "Marvell 88F6282", 2, MVS_Q_GENIIE|MVS_Q_SOC},
{MV_DEV_MV78100, 0x00, "Marvell MV78100", 2, MVS_Q_GENIIE|MVS_Q_SOC},
{MV_DEV_MV78100_Z0, 0x00,"Marvell MV78100", 2, MVS_Q_GENIIE|MVS_Q_SOC},
+ {MV_DEV_MV78260, 0x00, "Marvell MV78260", 2, MVS_Q_GENIIE|MVS_Q_SOC},
+ {MV_DEV_MV78460, 0x00, "Marvell MV78460", 2, MVS_Q_GENIIE|MVS_Q_SOC},
{0, 0x00, NULL, 0, 0}
};