From 5f93376f6703829aa15b068be52a84748507fca2 Mon Sep 17 00:00:00 2001
From: hongruichen <chraac@gmail.com>
Date: Fri, 10 Jan 2025 11:30:00 +0800
Subject: [PATCH] fix compiling error after merged

---
 ggml/src/ggml-qnn/backend-ops.cpp    | 3 ++-
 ggml/src/ggml-qnn/op-config-caps.cpp | 1 +
 src/llama.cpp                        | 4 ----
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ggml/src/ggml-qnn/backend-ops.cpp b/ggml/src/ggml-qnn/backend-ops.cpp
index 1ed01bfd68..75c90e235b 100644
--- a/ggml/src/ggml-qnn/backend-ops.cpp
+++ b/ggml/src/ggml-qnn/backend-ops.cpp
@@ -314,7 +314,8 @@ constexpr const ggml_qnn_op_t kQnnOpsTable[] = {
     nullptr, // GGML_OP_WIN_UNPART
     nullptr, // GGML_OP_GET_REL_POS
     nullptr, // GGML_OP_ADD_REL_POS
-    nullptr, // GGML_OP_RWKV_WKV
+    nullptr, // GGML_OP_RWKV_WKV6
+    nullptr, // GGML_OP_GATED_LINEAR_ATTN
 
     nullptr, // GGML_OP_UNARY
 
diff --git a/ggml/src/ggml-qnn/op-config-caps.cpp b/ggml/src/ggml-qnn/op-config-caps.cpp
index aab8f65958..7fa3d11aff 100644
--- a/ggml/src/ggml-qnn/op-config-caps.cpp
+++ b/ggml/src/ggml-qnn/op-config-caps.cpp
@@ -139,6 +139,7 @@ constexpr const qnn_op_caps_t kOpCaps[] = {
     {}, // GGML_OP_GET_REL_POS
     {}, // GGML_OP_ADD_REL_POS
     {}, // GGML_OP_RWKV_WKV6
+    {}, // GGML_OP_GATED_LINEAR_ATTN
 
     {}, // GGML_OP_UNARY
 
diff --git a/src/llama.cpp b/src/llama.cpp
index 2a3409eacb..a364861d3c 100644
--- a/src/llama.cpp
+++ b/src/llama.cpp
@@ -11848,10 +11848,6 @@ struct llama_sampler_chain_params llama_sampler_chain_default_params() {
 size_t llama_max_devices(void) {
     return 16;
 }
-#if defined(GGML_USE_QNN)
-    return GGML_QNN_MAX_DEVICES;
-#else
-#endif
 
 bool llama_supports_mmap(void) {
     return llama_mmap::SUPPORTED;