diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-19 14:22:54 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-19 14:22:54 +0300 |
| commit | a1926d1745114789687ac029ae8c58944b7d2256 (patch) | |
| tree | c303e75615e378451a80b97bfd2c1ba54029d9bb /include/linux/firmware-map.h | |
| parent | 492e917635a0fa05439bb562fd51577efc9cef30 (diff) | |
| parent | 52fc43f7c1c416b114e88ff39635c36e67ef15b6 (diff) | |
| download | linux-a1926d1745114789687ac029ae8c58944b7d2256.tar.xz | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'include/linux/firmware-map.h')
| -rw-r--r-- | include/linux/firmware-map.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/firmware-map.h b/include/linux/firmware-map.h index c6dcc1dfe781..43fe52fcef0f 100644 --- a/include/linux/firmware-map.h +++ b/include/linux/firmware-map.h @@ -17,7 +17,6 @@ #define _LINUX_FIRMWARE_MAP_H #include <linux/list.h> -#include <linux/kobject.h> /* * provide a dummy interface if CONFIG_FIRMWARE_MEMMAP is disabled |