diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-08-15 16:33:02 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-15 20:18:29 +0400 |
| commit | 0a224c514f3e9620e167f9f6497ae526a41df22c (patch) | |
| tree | 54193db2b3c577cb6b086481da689ac8cc8322c5 /arch/arm/mach-kirkwood/Makefile.boot | |
| parent | c6041d4adde006216cd7e8da4558323ddb2e4255 (diff) | |
| parent | b74ffd85e32d44e8ed405a2a0a175ef4cd39cf67 (diff) | |
| download | linux-0a224c514f3e9620e167f9f6497ae526a41df22c.tar.xz | |
Merge branch 'fixes-for-v3.6' of git://git.infradead.org/users/jcooper/linux into fixes
From Jason Cooper <jason@lakedaemon.net>:
Small fixes for the orion platforms including kirkwood.
* 'fixes-for-v3.6' of git://git.infradead.org/users/jcooper/linux:
ARM: Kirkwood: fix Makefile.boot
ARM: Kirkwood: Fix iconnect leds
ARM: Orion: Set eth packet size csum offload limit
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-kirkwood/Makefile.boot')
| -rw-r--r-- | arch/arm/mach-kirkwood/Makefile.boot | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/Makefile.boot b/arch/arm/mach-kirkwood/Makefile.boot index a5717558ee89..a13299d758e1 100644 --- a/arch/arm/mach-kirkwood/Makefile.boot +++ b/arch/arm/mach-kirkwood/Makefile.boot @@ -7,7 +7,8 @@ dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += kirkwood-dns320.dtb dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += kirkwood-dns325.dtb dtb-$(CONFIG_MACH_ICONNECT_DT) += kirkwood-iconnect.dtb dtb-$(CONFIG_MACH_IB62X0_DT) += kirkwood-ib62x0.dtb -dtb-$(CONFIG_MACH_TS219_DT) += kirkwood-qnap-ts219.dtb +dtb-$(CONFIG_MACH_TS219_DT) += kirkwood-ts219-6281.dtb +dtb-$(CONFIG_MACH_TS219_DT) += kirkwood-ts219-6282.dtb dtb-$(CONFIG_MACH_GOFLEXNET_DT) += kirkwood-goflexnet.dtb dtb-$(CONFIG_MACH_LSXL_DT) += kirkwood-lschlv2.dtb dtb-$(CONFIG_MACH_LSXL_DT) += kirkwood-lsxhl.dtb |