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 /package/px5g/src | |
| 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 'package/px5g/src')
| -rw-r--r-- | package/px5g/src/polarssl/config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/px5g/src/polarssl/config.h b/package/px5g/src/polarssl/config.h index 6463e5219..ad3f9a7f3 100644 --- a/package/px5g/src/polarssl/config.h +++ b/package/px5g/src/polarssl/config.h @@ -64,7 +64,7 @@ /* * Uncomment to enable the use of assembly code. */ -#define POLARSSL_HAVE_ASM +/* #define POLARSSL_HAVE_ASM */ /* * Uncomment if the CPU supports SSE2 (IA-32 specific). |