diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /target/linux/generic/patches-3.7/850-glamo_headers.patch | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'target/linux/generic/patches-3.7/850-glamo_headers.patch')
| -rw-r--r-- | target/linux/generic/patches-3.7/850-glamo_headers.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.7/850-glamo_headers.patch b/target/linux/generic/patches-3.7/850-glamo_headers.patch index 363070d0a..689d14d62 100644 --- a/target/linux/generic/patches-3.7/850-glamo_headers.patch +++ b/target/linux/generic/patches-3.7/850-glamo_headers.patch @@ -10,7 +10,7 @@ #define FB_ACCEL_NEOMAGIC_NM2093 92 /* NeoMagic NM2093 */ --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild -@@ -130,6 +130,8 @@ header-y += gen_stats.h +@@ -131,6 +131,8 @@ header-y += gen_stats.h header-y += genetlink.h header-y += gfs2_ondisk.h header-y += gigaset_dev.h |