bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-04-18 06:44:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

Browse Source
This commit is contained in:
Russell King
2011-05-23 18:05:10 +01:00
parent e8765afe54 667f390bee a35d4e5873 4d5336d50a 041f10d46f be20902ba6
commit 4b60e5f90d
162 changed files with 412 additions and 10652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/mtd/maps/Makefile
View File

@@ -8,7 +8,6 @@ endif
# Chip mappings
obj-$(CONFIG_MTD_CDB89712) += cdb89712.o
obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o
obj-$(CONFIG_MTD_CFI_FLAGADM) += cfi_flagadm.o
obj-$(CONFIG_MTD_DC21285) += dc21285.o
obj-$(CONFIG_MTD_DILNETPC) += dilnetpc.o